forked from github-mirror/CoreProtect
fix waterlogged bucket incorrect logging (#860)
This commit is contained in:
1 parent
f0aad273f1
commit
eff43b7d6f
2 files changed
+2
-16
No files matched your search
@@ -32,27 +32,13 @@ public final class PlayerBucketEmptyListener extends Queue implements Listener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!event.isCancelled() && Config.getConfig(world).BUCKETS && inspect == 0) {
|
if (!event.isCancelled() && Config.getConfig(world).BUCKETS && inspect == 0) {
|
||||||
Block block = event.getBlockClicked();
|
Block block = event.getBlock();
|
||||||
BlockData blockData = block.getBlockData();
|
BlockData blockData = block.getBlockData();
|
||||||
Material type = Material.WATER;
|
Material type = Material.WATER;
|
||||||
if (event.getBucket().equals(Material.LAVA_BUCKET)) {
|
if (event.getBucket().equals(Material.LAVA_BUCKET)) {
|
||||||
type = Material.LAVA;
|
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();
|
BlockState blockState = block.getState();
|
||||||
int worldId = WorldUtils.getWorldId(block.getWorld().getName());
|
int worldId = WorldUtils.getWorldId(block.getWorld().getName());
|
||||||
int unixTimestamp = (int) (System.currentTimeMillis() / 1000L);
|
int unixTimestamp = (int) (System.currentTimeMillis() / 1000L);
|
||||||
|
|||||||
@@ -19,7 +19,7 @@ public final class PlayerBucketFillListener extends Queue implements Listener {
|
|||||||
@EventHandler(priority = EventPriority.HIGHEST)
|
@EventHandler(priority = EventPriority.HIGHEST)
|
||||||
protected void onPlayerBucketFill(PlayerBucketFillEvent event) {
|
protected void onPlayerBucketFill(PlayerBucketFillEvent event) {
|
||||||
String player = event.getPlayer().getName();
|
String player = event.getPlayer().getName();
|
||||||
Block block = event.getBlockClicked();
|
Block block = event.getBlock();
|
||||||
World world = block.getWorld();
|
World world = block.getWorld();
|
||||||
Material type = block.getType();
|
Material type = block.getType();
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user