From 3a6bca872f292ffc0d4573008e1358bff561d0cb Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Mon, 29 Apr 2013 10:42:33 +0200 Subject: [PATCH] Allow people with permission to manage access to deny themselves access. How else should these people feel confident they can setup the access correctly? Personally my reaction was to try to deny myself and I was confused when I couldnt. --- src/com/massivecraft/factions/TerritoryAccess.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/com/massivecraft/factions/TerritoryAccess.java b/src/com/massivecraft/factions/TerritoryAccess.java index 684a69d4..960a10c8 100644 --- a/src/com/massivecraft/factions/TerritoryAccess.java +++ b/src/com/massivecraft/factions/TerritoryAccess.java @@ -258,8 +258,7 @@ public class TerritoryAccess // this should normally only be checked after running subjectHasAccess() or fPlayerHasAccess() above to see if they have access explicitly granted public boolean subjectAccessIsRestricted(Object testSubject) { - Faction hostFaction = FactionColls.get().get(testSubject).get(this.getHostFactionId()); - return ( ! this.isHostFactionAllowed() && this.doesHostFactionMatch(testSubject) && ! FPerm.ACCESS.has(testSubject, hostFaction, false)); + return (!this.isHostFactionAllowed() && this.doesHostFactionMatch(testSubject)); } } \ No newline at end of file