summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElgarL <ElgarL@Palmergames.com>2013-07-22 13:29:06 +0100
committerKHobbits <rob@khobbits.co.uk>2014-05-04 12:50:08 +0100
commit427dd714c980e57aa8d9cc676e0dd5e2be48176e (patch)
tree7454c9ea80357ff6c7d3c9ab2bf29b4e9df3a682
parent9d7a2043f7867f78bde17a12ba1340d787f6641b (diff)
downloadEssentials-427dd714c980e57aa8d9cc676e0dd5e2be48176e.tar
Essentials-427dd714c980e57aa8d9cc676e0dd5e2be48176e.tar.gz
Essentials-427dd714c980e57aa8d9cc676e0dd5e2be48176e.tar.lz
Essentials-427dd714c980e57aa8d9cc676e0dd5e2be48176e.tar.xz
Essentials-427dd714c980e57aa8d9cc676e0dd5e2be48176e.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));
+ }
}
}