From af9fb6d56f4003261263a67ce6f146185f6abb46 Mon Sep 17 00:00:00 2001 From: ryanhamshire Date: Tue, 21 Apr 2015 21:25:04 -0700 Subject: [PATCH] Fixed bugs with explosion protection options. All permutations now work as intended. --- src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java index 0b43b83..7a93b39 100644 --- a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java @@ -258,16 +258,16 @@ class EntityEventHandler implements Listener } //if yes, apply claim exemptions if they should apply - if((claim != null && claim.areExplosivesAllowed) || !GriefPrevention.instance.config_blockClaimExplosions) + if(claim != null && (claim.areExplosivesAllowed || !GriefPrevention.instance.config_blockClaimExplosions)) { explodedBlocks.add(block); continue; } //if no, then also consider surface rules - if(applySurfaceRules && claim == null) + if(claim == null) { - if(block.getLocation().getBlockY() < GriefPrevention.instance.getSeaLevel(world) - 7) + if(!applySurfaceRules || block.getLocation().getBlockY() < GriefPrevention.instance.getSeaLevel(world) - 7) { explodedBlocks.add(block); }