From 80f5972c04708d06fc3c31804655511ff1ddb926 Mon Sep 17 00:00:00 2001
From: ElgarL <ElgarL@Palmergames.com>
Date: Mon, 22 Jul 2013 13:29:06 +0100
Subject: Allow Exception permission to override negations when in the same
 group.

---
 .../anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java    | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'EssentialsGroupManager/src')

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));
+					}
 				}
 			}
 
-- 
cgit v1.2.3