From 455d422c1fbe46f421123639fa93720c20bf5ded Mon Sep 17 00:00:00 2001 From: ryanhamshire Date: Sat, 29 Aug 2015 10:53:38 -0700 Subject: [PATCH] Messaging update for siege mode. --- src/me/ryanhamshire/GriefPrevention/BlockEventHandler.java | 5 +++-- src/me/ryanhamshire/GriefPrevention/GriefPrevention.java | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/me/ryanhamshire/GriefPrevention/BlockEventHandler.java b/src/me/ryanhamshire/GriefPrevention/BlockEventHandler.java index f774d97..6d53e1f 100644 --- a/src/me/ryanhamshire/GriefPrevention/BlockEventHandler.java +++ b/src/me/ryanhamshire/GriefPrevention/BlockEventHandler.java @@ -218,7 +218,7 @@ public class BlockEventHandler implements Listener playerData.lastClaim = claim; //warn about TNT not destroying claimed blocks - if(block.getType() == Material.TNT && !claim.areExplosivesAllowed) + if(block.getType() == Material.TNT && !claim.areExplosivesAllowed && playerData.siegeData == null) { GriefPrevention.sendMessage(player, TextMode.Warn, Messages.NoTNTDamageClaims); GriefPrevention.sendMessage(player, TextMode.Instr, Messages.ClaimExplosivesAdvertisement); @@ -342,7 +342,8 @@ public class BlockEventHandler implements Listener if( GriefPrevention.instance.config_blockSurfaceOtherExplosions && block.getType() == Material.TNT && block.getWorld().getEnvironment() != Environment.NETHER && block.getY() > GriefPrevention.instance.getSeaLevel(block.getWorld()) - 5 && - claim == null) + claim == null && + playerData.siegeData == null) { GriefPrevention.sendMessage(player, TextMode.Warn, Messages.NoTNTDamageAboveSeaLevel); } diff --git a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java index 5d053c1..2794427 100644 --- a/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java +++ b/src/me/ryanhamshire/GriefPrevention/GriefPrevention.java @@ -2036,7 +2036,9 @@ public class GriefPrevention extends JavaPlugin //confirmation message for attacker, warning message for defender GriefPrevention.sendMessage(defender, TextMode.Warn, Messages.SiegeAlert, attacker.getName()); - GriefPrevention.sendMessage(player, TextMode.Success, Messages.SiegeConfirmed, defender.getName()); + GriefPrevention.sendMessage(player, TextMode.Success, Messages.SiegeConfirmed, defender.getName()); + + return true; } else if(cmd.getName().equalsIgnoreCase("softmute")) {