Skip to content

Don't assume waterlogged blocks get destroyed by water #243

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

Merged
rymiel merged 2 commits into from
Dec 2, 2025
Merged

Don't assume waterlogged blocks get destroyed by water #243

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0e9274
Don't assume waterlogged blocks get destroyed by water
rymiel Dec 2, 2025
a4779b9
Make un-waterlogging an interaction as well
rymiel Dec 2, 2025
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
10 changes: 10 additions & 0 deletions bukkit/src/main/java/org/popcraft/bolt/listeners/BlockListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import org.bukkit.block.ChiseledBookshelf;
import org.bukkit.block.PistonMoveReaction;
import org.bukkit.block.data.Directional;
import org.bukkit.block.data.Waterlogged;
import org.bukkit.block.data.type.Leaves;
import org.bukkit.block.data.type.Piston;
import org.bukkit.entity.Player;
Expand Down Expand Up @@ -470,6 +471,11 @@ public void onPlayerBucketEmpty(final PlayerBucketEmptyEvent e) {
if (!plugin.canAccess(protection, player, Permission.INTERACT, Permission.DEPOSIT)) {
e.setCancelled(true);
}
} else if (e.getBlock().getBlockData() instanceof Waterlogged) {
// Blocks which can be waterlogged won't be replaced, but their data will change
if (!plugin.canAccess(protection, player, Permission.INTERACT)) {
e.setCancelled(true);
}
} else if (!e.getBlock().equals(e.getBlockClicked())) {
// Prevent accidental deletion of protected blocks by them getting replaced.
// Purposefully not checking for destroy permissions, that logic is for BlockBreakEvent.
Expand All @@ -488,6 +494,10 @@ public void onPlayerBucketFill(final PlayerBucketFillEvent e) {
if (!plugin.canAccess(protection, player, Permission.INTERACT, Permission.WITHDRAW)) {
e.setCancelled(true);
}
} else if (e.getBlock().getBlockData() instanceof Waterlogged) {
if (!plugin.canAccess(protection, player, Permission.INTERACT)) {
e.setCancelled(true);
}
}
}

Expand Down