From 38db64804473fd6770b1d400b4f01fd138d9fab4 Mon Sep 17 00:00:00 2001
From: ProSavage <naman0311@gmail.com>
Date: Wed, 17 Oct 2018 15:53:10 -0500
Subject: [PATCH] Container permission fixed ( relationally )

---
 .../listeners/FactionsPlayerListener.java     | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
index c558b495..9b00bef8 100644
--- a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
+++ b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java
@@ -301,16 +301,30 @@ public class FactionsPlayerListener implements Listener {
                 return true;
             }
         }
+        // Move up access check to check for exceptions
+        Access access = otherFaction.getAccess(me, action);
+        boolean doTerritoryEnemyProtectedCheck = true;
 
-        // You may use any block unless it is another faction's territory...
-        if (rel.isNeutral() || (rel.isEnemy() && Conf.territoryEnemyProtectMaterials) || (rel.isAlly() && Conf.territoryAllyProtectMaterials) || (rel.isTruce() && Conf.territoryTruceProtectMaterials)) {
-            if (!justCheck) {
-                me.msg(TL.PLAYER_USE_TERRITORY, (material == P.p.SOIL ? "trample " : "use ") + TextUtil.getMaterialName(material), otherFaction.getTag(myFaction));
+        if (action.equals(PermissableAction.CONTAINER)) {
+            if (access == Access.ALLOW) {
+                doTerritoryEnemyProtectedCheck = false;
             }
-            return false;
         }
 
-        Access access = otherFaction.getAccess(me, action);
+        // Did not nest the boolean so that it stands out when Im looking
+        // through the code later.
+        if (doTerritoryEnemyProtectedCheck) {
+            // You may use any block unless it is another faction's territory...
+            if (rel.isNeutral() || (rel.isEnemy() && Conf.territoryEnemyProtectMaterials) || (rel.isAlly() && Conf.territoryAllyProtectMaterials) || (rel.isTruce() && Conf.territoryTruceProtectMaterials)) {
+                if (!justCheck) {
+                    me.msg(TL.PLAYER_USE_TERRITORY, (material == P.p.SOIL ? "trample " : "use ") + TextUtil.getMaterialName(material), otherFaction.getTag(myFaction));
+                }
+                return false;
+            }
+        }
+
+
+
         if (access != Access.ALLOW && me.getRole() != Role.ADMIN) {
             // TODO: Update this once new access values are added other than just allow / deny.
             if ((myFaction.getOwnerListString(loc) != null && !myFaction.getOwnerListString(loc).isEmpty() && myFaction.getOwnerListString(loc).contains(player.getName()))) {