summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElgarL <ElgarL@Palmergames.com>2013-07-22 13:29:06 +0100
committerElgarL <ElgarL@Palmergames.com>2013-07-22 13:29:06 +0100
commit7b0d3d49f139d1f439779f8b34787024f75f3719 (patch)
treeeef2e76e75043889d9933df5abff32af6086258b
parent00cc13ce1adf5e4508c34f097404a35782e20e57 (diff)
downloadEssentials-7b0d3d49f139d1f439779f8b34787024f75f3719.tar
Essentials-7b0d3d49f139d1f439779f8b34787024f75f3719.tar.gz
Essentials-7b0d3d49f139d1f439779f8b34787024f75f3719.tar.lz
Essentials-7b0d3d49f139d1f439779f8b34787024f75f3719.tar.xz
Essentials-7b0d3d49f139d1f439779f8b34787024f75f3719.zip
Allow Exception permission to override negations when in the same group.
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java
index 069289c93..39ad300e0 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java
@@ -151,6 +151,10 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
// or It's a negated perm where a normal perm doesn't exists (don't allow inheritance to negate higher perms)
if ((!negated && !playerPermArray.contains(perm) && !wildcardNegation(playerPermArray, perm)) || (negated && !playerPermArray.contains(perm.substring(1)) && !wildcardNegation(playerPermArray, perm.substring(1))))
playerPermArray.add(perm);
+
+ if (perm.startsWith("+") && wildcardNegation(groupPermArray, perm.substring(1))) {
+ playerPermArray.add(perm.substring(1));
+ }
}
}