Skip to content
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

Jump to bottom

Fix waterlogging checking affected location #1156

Merged
merged 3 commits into from Dec 16, 2020
Merged

Fix waterlogging checking affected location #1156

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e97f78
Fix waterlogging checking affected location
nouish Dec 16, 2020
06a73f5
Avoid regression for lava buckets
nouish Dec 16, 2020
7d73bdb
Check if Waterlogged instead
nouish Dec 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
63 changes: 63 additions & 0 deletions src/main/java/me/ryanhamshire/GriefPrevention/PlayerEventHandler.java
View file
Open in desktop
Expand Up @@ -1452,6 +1452,60 @@ public void onItemHeldChange(PlayerItemHeldEvent event)
private final Set<Material> commonAdjacentBlocks_water = EnumSet.of(Material.WATER, Material.FARMLAND, Material.DIRT, Material.STONE);
private final Set<Material> commonAdjacentBlocks_lava = EnumSet.of(Material.LAVA, Material.DIRT, Material.STONE);

/**
* All waterloggable blocks, where PlayerBucketEmptyEvent should check the clicked location,
* rather than the relative adjacent location.
*/
private static final Set<Material> NON_RELATIVE_ADJACENT_WATERLOGGABLE_BLOCKS;
static
{
// Does NOT include chests, ender chests, or trapped chests, as these are attempted
// opened, rather than waterlogged. To waterlog a chest, you would have to target the block
// below, so that the relative check will then be at the correct location, representing the chest.
Set<Material> types = EnumSet.noneOf(Material.class);
types.addAll(Tag.FENCES.getValues());
types.addAll(Tag.STAIRS.getValues());
types.addAll(Tag.SLABS.getValues());
types.addAll(Tag.WALLS.getValues());
types.addAll(Tag.CORAL_PLANTS.getValues());
types.addAll(Tag.TRAPDOORS.getValues());
types.add(Material.SEA_PICKLE);
types.add(Material.CONDUIT);
types.add(Material.LADDER);
types.add(Material.CHAIN);
types.add(Material.IRON_BARS);
types.add(Material.SCAFFOLDING);
types.add(Material.CAMPFIRE);
types.add(Material.SOUL_CAMPFIRE);
types.add(Material.LANTERN);
types.add(Material.SOUL_LANTERN);
// All dead coral, no such tag unfortunately.
types.add(Material.DEAD_TUBE_CORAL);
types.add(Material.DEAD_BRAIN_CORAL);
types.add(Material.DEAD_BUBBLE_CORAL);
types.add(Material.DEAD_FIRE_CORAL);
types.add(Material.DEAD_HORN_CORAL);
// All glass panes, no such tag unfortunately.
types.add(Material.GLASS_PANE);
types.add(Material.WHITE_STAINED_GLASS_PANE);
types.add(Material.ORANGE_STAINED_GLASS_PANE);
types.add(Material.MAGENTA_STAINED_GLASS_PANE);
types.add(Material.LIGHT_BLUE_STAINED_GLASS_PANE);
types.add(Material.YELLOW_STAINED_GLASS_PANE);
types.add(Material.LIME_STAINED_GLASS_PANE);
types.add(Material.PINK_STAINED_GLASS_PANE);
types.add(Material.GRAY_STAINED_GLASS_PANE);
types.add(Material.LIGHT_GRAY_STAINED_GLASS_PANE);
types.add(Material.CYAN_STAINED_GLASS_PANE);
types.add(Material.PURPLE_STAINED_GLASS_PANE);
types.add(Material.BLUE_STAINED_GLASS_PANE);
types.add(Material.BROWN_STAINED_GLASS_PANE);
types.add(Material.GREEN_STAINED_GLASS_PANE);
types.add(Material.RED_STAINED_GLASS_PANE);
types.add(Material.BLACK_STAINED_GLASS_PANE);
NON_RELATIVE_ADJACENT_WATERLOGGABLE_BLOCKS = types;
}

@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
public void onPlayerBucketEmpty(PlayerBucketEmptyEvent bucketEvent)
{
Expand All @@ -1461,6 +1515,15 @@ public void onPlayerBucketEmpty(PlayerBucketEmptyEvent bucketEvent)
Block block = bucketEvent.getBlockClicked().getRelative(bucketEvent.getBlockFace());
int minLavaDistance = 10;

// Fixes #1155:
// Prevents waterlogging blocks placed on a claim's edge.
// Waterlogging a block affects the clicked block, and NOT the adjacent location relative to it.
if (bucketEvent.getBucket() == Material.WATER_BUCKET
&& NON_RELATIVE_ADJACENT_WATERLOGGABLE_BLOCKS.contains(bucketEvent.getBlockClicked().getType()))
{
block = bucketEvent.getBlockClicked();
}

//make sure the player is allowed to build at the location
String noBuildReason = instance.allowBuild(player, block.getLocation(), Material.WATER);
if (noBuildReason != null)
Expand Down