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

Prevent chests connecting on claim boundary #1054

Merged
merged 7 commits into from Dec 10, 2020
Merged

Prevent chests connecting on claim boundary #1054

Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d1e2882
Prevent chests connecting on claim boundary
FrankHeijden Oct 10, 2020
dbe2175
Check relative claim with the claim the other connected component mig…
FrankHeijden Oct 10, 2020
e1f818d
Merge branch 'master' into fix/chests
FrankHeijden Oct 14, 2020
7b6f20b
Allow chests to connect in claims of same owner
FrankHeijden Oct 14, 2020
d788390
refactor doublechest across claim boundary check to a separate method
RoboMWM Dec 10, 2020
933f77b
expand shorthand if-else
RoboMWM Dec 10, 2020
051aab9
Merge branch 'master' into fix/chests
RoboMWM Dec 10, 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
48 changes: 48 additions & 0 deletions src/main/java/me/ryanhamshire/GriefPrevention/BlockEventHandler.java
View file
Open in desktop
Expand Up @@ -33,6 +33,7 @@
import org.bukkit.block.Hopper;
import org.bukkit.block.PistonMoveReaction;
import org.bukkit.block.data.BlockData;
import org.bukkit.block.data.type.Chest;
import org.bukkit.block.data.type.Dispenser;
import org.bukkit.entity.Fireball;
import org.bukkit.entity.Item;
Expand Down Expand Up @@ -285,6 +286,10 @@ public void onBlockPlace(BlockPlaceEvent placeEvent)
//if the block is being placed within or under an existing claim
PlayerData playerData = this.dataStore.getPlayerData(player.getUniqueId());
Claim claim = this.dataStore.getClaimAt(block.getLocation(), true, playerData.lastClaim);

//If block is a chest, don't allow a DoubleChest to form across a claim boundary
denyConnectingDoubleChestsAcrossClaimBoundary(claim, block, player);

if (claim != null)
{
playerData.lastClaim = claim;
Expand Down Expand Up @@ -489,6 +494,49 @@ static boolean isActiveBlock(Material type)
return false;
}

private static final BlockFace[] HORIZONTAL_DIRECTIONS = new BlockFace[] {
BlockFace.NORTH,
BlockFace.EAST,
BlockFace.SOUTH,
BlockFace.WEST
};
private void denyConnectingDoubleChestsAcrossClaimBoundary(Claim claim, Block block, Player player)
{
UUID claimOwner = null;
if (claim != null)
claimOwner = claim.getOwnerID();

// Check for double chests placed just outside the claim boundary
if (block.getBlockData() instanceof Chest)
{
for (BlockFace face : HORIZONTAL_DIRECTIONS)
{
Block relative = block.getRelative(face);
if (!(relative.getBlockData() instanceof Chest)) continue;

Claim relativeClaim = this.dataStore.getClaimAt(relative.getLocation(), true, claim);
UUID relativeClaimOwner = relativeClaim == null ? null : relativeClaim.getOwnerID();

// Chests outside claims should connect (both null)
// and chests inside the same claim should connect (equal)
if (Objects.equals(claimOwner, relativeClaimOwner)) break;

// Change both chests to singular chests
Chest chest = (Chest) block.getBlockData();
chest.setType(Chest.Type.SINGLE);
block.setBlockData(chest);

Chest relativeChest = (Chest) relative.getBlockData();
relativeChest.setType(Chest.Type.SINGLE);
relative.setBlockData(relativeChest);

// Resend relative chest block to prevent visual bug
player.sendBlockChange(relative.getLocation(), relativeChest);
break;
}
}
}

// Prevent pistons pushing blocks into or out of claims.
@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
public void onBlockPistonExtend(BlockPistonExtendEvent event)
Expand Down