Altitude/AlttdGriefPrevention
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent doublechests forming on claim boundary (#1054)

Browse Source
This commit is contained in:
Frank van der Heijden 2020-12-10 20:13:44 +01:00 committed by GitHub
parent 3350e2a0bf
commit c014901b7a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/main/java/me/ryanhamshire/GriefPrevention/BlockEventHandler.java
View File

@ -34,6 +34,7 @@ import org.bukkit.block.BlockState;
import org.bukkit.block.Hopper; import org.bukkit.block.Hopper;
import org.bukkit.block.PistonMoveReaction; import org.bukkit.block.PistonMoveReaction;
import org.bukkit.block.data.BlockData; import org.bukkit.block.data.BlockData;
import org.bukkit.block.data.type.Chest;
import org.bukkit.block.data.type.Dispenser; import org.bukkit.block.data.type.Dispenser;
import org.bukkit.entity.Fireball; import org.bukkit.entity.Fireball;
import org.bukkit.entity.Item; import org.bukkit.entity.Item;
@ -287,6 +288,10 @@ public class BlockEventHandler implements Listener
//if the block is being placed within or under an existing claim //if the block is being placed within or under an existing claim
PlayerData playerData = this.dataStore.getPlayerData(player.getUniqueId()); PlayerData playerData = this.dataStore.getPlayerData(player.getUniqueId());
Claim claim = this.dataStore.getClaimAt(block.getLocation(), true, playerData.lastClaim); 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) if (claim != null)
{ {
playerData.lastClaim = claim; playerData.lastClaim = claim;
@ -491,6 +496,49 @@ public class BlockEventHandler implements Listener
return false; 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. // Prevent pistons pushing blocks into or out of claims.
@EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST) @EventHandler(ignoreCancelled = true, priority = EventPriority.LOWEST)
public void onBlockPistonExtend(BlockPistonExtendEvent event) public void onBlockPistonExtend(BlockPistonExtendEvent event)