From dd6beb3b8208a93020af475e9ba3406121117be2 Mon Sep 17 00:00:00 2001 From: taoneill Date: Tue, 3 Jan 2012 22:07:18 -0500 Subject: [PATCH] Fixed disablebuildmessage setting which broke block placement protection by buildinzonesonly and didn't work for block breaking. --- .../java/bukkit/tommytony/war/WarBlockListener.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/war/src/main/java/bukkit/tommytony/war/WarBlockListener.java b/war/src/main/java/bukkit/tommytony/war/WarBlockListener.java index 7aceb96..04a47f1 100644 --- a/war/src/main/java/bukkit/tommytony/war/WarBlockListener.java +++ b/war/src/main/java/bukkit/tommytony/war/WarBlockListener.java @@ -89,8 +89,10 @@ public class WarBlockListener extends BlockListener { } // buildInZonesOnly - if (zone == null && War.war.isBuildInZonesOnly() && !War.war.canBuildOutsideZone(player) && !War.war.isDisableBuildMessage()) { - War.war.badMsg(player, "You can only build inside warzones. Ask for the 'war.build' permission to build outside."); + if (zone == null && War.war.isBuildInZonesOnly() && !War.war.canBuildOutsideZone(player)) { + if (!War.war.isDisableBuildMessage()) { + War.war.badMsg(player, "You can only build inside warzones. Ask for the 'war.build' permission to build outside."); + } event.setCancelled(true); return; } @@ -287,7 +289,9 @@ public class WarBlockListener extends BlockListener { // buildInZonesOnly Warzone blockZone = Warzone.getZoneByLocation(new Location(block.getWorld(), block.getX(), block.getY(), block.getZ())); if (blockZone == null && War.war.isBuildInZonesOnly() && !War.war.canBuildOutsideZone(player)) { - War.war.badMsg(player, "You can only build inside warzones. Ask for the 'war.build' permission to build outside."); + if (!War.war.isDisableBuildMessage()) { + War.war.badMsg(player, "You can only build inside warzones. Ask for the 'war.build' permission to build outside."); + } event.setCancelled(true); return; }