Skip to content

Improving protection check for bucket usage #4887

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
RedstoneFuture wants to merge 3 commits into
base: main
Choose a base branch
from
+15 −9
Open

Improving protection check for bucket usage #4887

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e6a6cd4
Improving check for bucket interaction
RedstoneFuture Jun 13, 2026
f339ee5
Removing Sponge because it is not a block for an interaction
RedstoneFuture Jun 14, 2026
fb48c35
Replace Material type check
RedstoneFuture Jun 14, 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
24 changes: 15 additions & 9 deletions Bukkit/src/main/java/com/plotsquared/bukkit/listener/PlayerEventListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1423,9 +1423,12 @@ public void onBucketEmpty(PlayerBucketEmptyEvent event) {
area.getFlag(UseFlag.class) : Collections.emptyList());
BlockType type = BukkitAdapter.asBlockType(block.getType());
for (final BlockTypeWrapper blockTypeWrapper : use) {
if (blockTypeWrapper.accepts(BlockTypes.AIR) || blockTypeWrapper
.accepts(type)) {
return;
if (blockTypeWrapper.accepts(BlockTypes.AIR) || blockTypeWrapper.accepts(type)) {
// Allows this event for blocks that can be interacted with using a bucket without it being considered
// as "building" (= make it waterlogged or drop the block by flooding it)
if (type == BlockTypes.CAULDRON || type == BlockTypes.WATER_CAULDRON || type == BlockTypes.LAVA_CAULDRON) {
return;
}

@RedstoneFuture RedstoneFuture Jun 14, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used a different spelling; see the next commit.

}
}
if (plot == null) {
Expand Down Expand Up @@ -1490,8 +1493,8 @@ public void onLeave(PlayerQuitEvent event) {

@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onBucketFill(PlayerBucketFillEvent event) {
Block blockClicked = event.getBlockClicked();
Location location = BukkitUtil.adapt(blockClicked.getLocation());
Block block = event.getBlock();
Location location = BukkitUtil.adapt(block.getLocation());
PlotArea area = location.getPlotArea();
if (area == null) {
return;
Expand All @@ -1502,11 +1505,14 @@ public void onBucketFill(PlayerBucketFillEvent event) {
final List<BlockTypeWrapper> use =
Optional.ofNullable(plot).map(p -> p.getFlag(UseFlag.class)).orElse(area.isRoadFlags() ?
area.getFlag(UseFlag.class) : Collections.emptyList());
BlockType type = BukkitAdapter.asBlockType(blockClicked.getType());
BlockType type = BukkitAdapter.asBlockType(block.getType());
for (final BlockTypeWrapper blockTypeWrapper : use) {
if (blockTypeWrapper.accepts(BlockTypes.AIR) || blockTypeWrapper
.accepts(type)) {
return;
if (blockTypeWrapper.accepts(BlockTypes.AIR) || blockTypeWrapper.accepts(type)) {
// Allows this event for blocks that can be interacted with using a bucket without it being considered
// as "building" (= make it waterlogged or drop the block by flooding it)
if (type == BlockTypes.CAULDRON || type == BlockTypes.WATER_CAULDRON || type == BlockTypes.LAVA_CAULDRON) {
return;
}

@RedstoneFuture RedstoneFuture Jun 14, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used a different spelling; see the next commit.

}
}
if (plot == null) {
Expand Down
Loading