Skip to content

fix waterlogged bucket incorrect logging (Resolves #858) #860

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guss-alberto wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix waterlogged bucket incorrect logging (Resolves #858) #860

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 1 addition & 15 deletions src/main/java/net/coreprotect/listener/player/PlayerBucketEmptyListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,27 +32,13 @@ protected void onPlayerBucketEmpty(org.bukkit.event.player.PlayerBucketEmptyEven
}

if (!event.isCancelled() && Config.getConfig(world).BUCKETS && inspect == 0) {
Block block = event.getBlockClicked();
Block block = event.getBlock();
BlockData blockData = block.getBlockData();
Material type = Material.WATER;
if (event.getBucket().equals(Material.LAVA_BUCKET)) {
type = Material.LAVA;
}

boolean getRelative = true;
if (blockData instanceof Waterlogged) {
if (type.equals(Material.WATER)) {
boolean isWaterlogged = ((Waterlogged) blockData).isWaterlogged();
if (!isWaterlogged) {
getRelative = false;
}
}
}
if (getRelative) {
block = block.getRelative(event.getBlockFace());
blockData = block.getBlockData();
}

BlockState blockState = block.getState();
int worldId = WorldUtils.getWorldId(block.getWorld().getName());
int unixTimestamp = (int) (System.currentTimeMillis() / 1000L);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/coreprotect/listener/player/PlayerBucketFillListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public final class PlayerBucketFillListener extends Queue implements Listener {
@EventHandler(priority = EventPriority.HIGHEST)
protected void onPlayerBucketFill(PlayerBucketFillEvent event) {
String player = event.getPlayer().getName();
Block block = event.getBlockClicked();
Block block = event.getBlock();
World world = block.getWorld();
Material type = block.getType();

Expand Down