From d7646516ec622cd1ce845b1e60f91079d4797856 Mon Sep 17 00:00:00 2001 From: Trent Hensler Date: Mon, 12 Mar 2018 21:06:53 -0700 Subject: [PATCH] Check for perms after checking if it's a server faction --- .../factions/listeners/FactionsPlayerListener.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java index e314d0de..69a15792 100644 --- a/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java +++ b/src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java @@ -319,11 +319,6 @@ public class FactionsPlayerListener implements Listener { return true; } - Access access = otherFaction.getAccess(me, PermissableAction.ITEM); - if (access != null && access != Access.UNDEFINED) { - return access == Access.ALLOW; - } - if (otherFaction.hasPlayersOnline()) { if (!Conf.territoryDenyUseageMaterials.contains(material)) { return true; // Item isn't one we're preventing for online factions. @@ -366,6 +361,11 @@ public class FactionsPlayerListener implements Listener { return false; } + Access access = otherFaction.getAccess(me, PermissableAction.ITEM); + if (access != null && access != Access.UNDEFINED) { + return access == Access.ALLOW; + } + Faction myFaction = me.getFaction(); Relation rel = myFaction.getRelationTo(otherFaction);