From bee36f5ba0cf71eaaff6c6133c5f4509c92246ba Mon Sep 17 00:00:00 2001
From: drtshock <drtshock13@gmail.com>
Date: Thu, 22 Jan 2015 20:41:05 -0600
Subject: [PATCH] Add warzoneDenyCommands.

---
 src/main/java/com/massivecraft/factions/Conf.java          | 1 +
 .../factions/listeners/FactionsPlayerListener.java         | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/massivecraft/factions/Conf.java b/src/main/java/com/massivecraft/factions/Conf.java
index 1b7e9a50..ab9bd932 100644
--- a/src/main/java/com/massivecraft/factions/Conf.java
+++ b/src/main/java/com/massivecraft/factions/Conf.java
@@ -145,6 +145,7 @@ public class Conf {
     // commands which will be prevented when in claimed territory of another faction
     public static Set<String> territoryNeutralDenyCommands = new LinkedHashSet<String>();
     public static Set<String> territoryEnemyDenyCommands = new LinkedHashSet<String>();
+    public static Set<String> warzoneDenyCommands = new LinkedHashSet<String>();
 
     public static double territoryShieldFactor = 0.3;
     public static boolean territoryDenyBuild = true;
diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
index 8754afc3..df90eb46 100644
--- a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
+++ b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
@@ -466,7 +466,7 @@ public class FactionsPlayerListener implements Listener {
     }
 
     public static boolean preventCommand(String fullCmd, Player player) {
-        if ((Conf.territoryNeutralDenyCommands.isEmpty() && Conf.territoryEnemyDenyCommands.isEmpty() && Conf.permanentFactionMemberDenyCommands.isEmpty())) {
+        if ((Conf.territoryNeutralDenyCommands.isEmpty() && Conf.territoryEnemyDenyCommands.isEmpty() && Conf.permanentFactionMemberDenyCommands.isEmpty() && Conf.warzoneDenyCommands.isEmpty())) {
             return false;
         }
 
@@ -510,6 +510,11 @@ public class FactionsPlayerListener implements Listener {
             return true;
         }
 
+        if(Board.getInstance().getFactionAt(new FLocation(me)).isWarZone() && !Conf.warzoneDenyCommands.isEmpty() && !me.isAdminBypassing() && isCommandInList(fullCmd, shortCmd, Conf.warzoneDenyCommands.iterator())) {
+            me.msg("<b>You can't use the command \"" + fullCmd + "\" in warzone.");
+            return true;
+        }
+
         return false;
     }