Merge branch 'master' into release

This commit is contained in:
ementalo 2012-01-25 14:29:05 +00:00
commit 270533652b
4 changed files with 33 additions and 31 deletions

View file

@ -118,3 +118,4 @@ v 1.9:
- addSubGroup now returns a boolean for success/failure.
- '/manuaddsub' now correctly reports if it was able to add the sub group.
- Allow negation to the * permission node when populating superperms.
- Fix trying to modify an unmodifiable collection breaking superperms.

View file

@ -153,11 +153,11 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
// Allow * node to populate ALL perms in Bukkit.
if (perms.contains("*")) {
permArray.addAll(GroupManager.BukkitPermissions.getAllRegisteredPermissions(includeChildren));
perms.remove("*");
}
for (String perm : perms) {
if (!perm.equalsIgnoreCase("*")) {
boolean negated = false;
if (perm.startsWith("-"))
negated = true;
@ -193,6 +193,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
}
}
}
}
return permArray;
}

Binary file not shown.

Binary file not shown.