TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-07-15 16:56:15 +00:00
Code Issues Projects Releases Wiki Activity

Properly fix inherited negated nodes.

Browse source
This commit is contained in:
ElgarL 2012-01-27 13:09:11 +00:00
parent 7f269187c5
commit 9ff8b69282
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java
View file

@ -134,12 +134,13 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
groupPermArray = populatePerms(ph.getGroup(group).getPermissionList(), includeChildren);
}
// Add all group permissions, unless negated by direct player perms.
// Add all group permissions, unless negated by earlier permissions.
for (String perm : groupPermArray) {
boolean negated = (perm.startsWith("-"));
// Perm doesn't already exists and there is no negation for it
// It's not a negated perm where a normal perm exists (don't allow inheritance to negate higher perms)
if ((!playerPermArray.contains(perm)) && (!playerPermArray.contains("-" + perm))
&& (!perm.startsWith("-") && (!playerPermArray.contains(perm.substring(1)))))
// 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) && !playerPermArray.contains("-" + perm))
|| (negated && !playerPermArray.contains(perm.substring(1))))
playerPermArray.add(perm);
}