Skip to content

Fix PlayerBucketEmptyEvent to use correct position check #2313

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
CatTeaA wants to merge 2 commits into
base: version/7.0.x
Choose a base branch
from
Open

Fix PlayerBucketEmptyEvent to use correct position check #2313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
495492c
Fix PlayerBucketEmptyEvent to use correct position check
CatTeaA Sep 27, 2026
514245f
Considering that cauldrons trigger PlayerBucketEmptyEvent
CatTeaA Sep 27, 2026
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
9 changes: 7 additions & 2 deletions ...d-bukkit/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -668,8 +668,13 @@ public void onPlayerBucketEmpty(PlayerBucketEmptyEvent event) {
Player player = event.getPlayer();
Block blockClicked = event.getBlockClicked();
Block blockAffected;

if (blockClicked.getBlockData() instanceof Waterlogged) {
boolean canPlaceInside = false;
// Can be placed inside blocks only when not sneaking
if (!player.isSneaking()) {
canPlaceInside = (event.getBucket() != Material.LAVA_BUCKET && blockClicked.getBlockData() instanceof Waterlogged)
|| (Materials.isCauldron(blockClicked.getType()) && Materials.isCauldronBucketType(event.getBucket()));
}
if (canPlaceInside) {
blockAffected = blockClicked;
} else {
blockAffected = blockClicked.getRelative(event.getBlockFace());
Expand Down
16 changes: 16 additions & 0 deletions worldguard-bukkit/src/main/java/com/sk89q/worldguard/bukkit/util/Materials.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,6 +1057,7 @@ public static Material getBucketBlockMaterial(Material type) {
return switch (type) {
case LAVA_BUCKET -> Material.LAVA;
case WATER_BUCKET -> Material.WATER;
case POWDER_SNOW_BUCKET -> Material.POWDER_SNOW;
default -> Material.WATER;
};
}
Expand Down Expand Up @@ -1583,4 +1584,19 @@ public static boolean isAmethystGrowth(Material mat) {
public static boolean isSculkGrowth(Material mat) {
return mat == Material.SCULK || mat == Material.SCULK_VEIN;
}

public static boolean isCauldron(Material mat) {
return switch (mat) {
case CAULDRON, LAVA_CAULDRON, POWDER_SNOW_CAULDRON, WATER_CAULDRON -> true;
default -> false;
};
}

// Other buckets containing mobs cannot be placed inside cauldrons
public static boolean isCauldronBucketType(Material mat) {
return switch (mat) {
case WATER_BUCKET, LAVA_BUCKET, POWDER_SNOW_BUCKET -> true;
default -> false;
};
}
}
Loading