From a4e06db112658fc5334462795034dd93b0626205 Mon Sep 17 00:00:00 2001 From: Brettflan Date: Fri, 12 Apr 2013 11:59:33 -0500 Subject: [PATCH] made "worldGuardBuildPriority" apply in Wilderness and WarZone, not just SafeZone --- .../factions/listeners/FactionsBlockListener.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/com/massivecraft/factions/listeners/FactionsBlockListener.java b/src/com/massivecraft/factions/listeners/FactionsBlockListener.java index 1be12c52..da97a611 100644 --- a/src/com/massivecraft/factions/listeners/FactionsBlockListener.java +++ b/src/com/massivecraft/factions/listeners/FactionsBlockListener.java @@ -173,6 +173,9 @@ public class FactionsBlockListener implements Listener if (otherFaction.isNone()) { + if (Conf.worldGuardBuildPriority && Worldguard.playerCanBuild(player, location)) + return true; + if (!Conf.wildernessDenyBuild || Conf.worldsNoWildernessProtection.contains(location.getWorld().getName())) return true; // This is not faction territory. Use whatever you like here. @@ -183,12 +186,9 @@ public class FactionsBlockListener implements Listener } else if (otherFaction.isSafeZone()) { - if (Conf.worldGuardBuildPriority) - { - if (Worldguard.playerCanBuild(player, location)) - return true; - } - + if (Conf.worldGuardBuildPriority && Worldguard.playerCanBuild(player, location)) + return true; + if (!Conf.safeZoneDenyBuild || Permission.MANAGE_SAFE_ZONE.has(player)) return true; @@ -199,6 +199,9 @@ public class FactionsBlockListener implements Listener } else if (otherFaction.isWarZone()) { + if (Conf.worldGuardBuildPriority && Worldguard.playerCanBuild(player, location)) + return true; + if (!Conf.warZoneDenyBuild || Permission.MANAGE_WAR_ZONE.has(player)) return true;