Merge branch 'refs/heads/groupmanager'

EssentialsGroupBridge/src/org/anjocaido/groupmanager/permissions/NijikoPermissionsProxy.java

@@ -521,10 +521,10 @@ public class NijikoPermissionsProxy extends PermissionHandler {
 
     @Override
     public boolean has(String world, String playerName, String permission) {
-        if (permission == null || permission.equals("")) {
+    	if (permission == null || permission.isEmpty()) {
             return false;
         }
-        if (playerName == null || playerName == "") {
+    	if (playerName == null || playerName.isEmpty()) {
             GroupManager.logger.severe("A plugin is asking permission '" + permission + "' for a null player... Which plugin does that? Bastards!");
             return false;
         }

EssentialsGroupManager/src/Changelog.txt

@@ -76,3 +76,6 @@ v 1.5:
 v 1.6:
 	- Prevent Group.equals tests throwing a NullPointerException for GlobalGroups.
 	- Stop throwing errors on an empty users file.
+	- Optimize sorting to speedup permission tests.
+	- Fix superperms to pass all tests http://dev.bukkit.org/server-mods/superpermstest/
+	- Optimizations include changing the return of comparePermissionString.

EssentialsGroupManager/src/org/anjocaido/groupmanager/data/DataUnit.java

@@ -6,6 +6,8 @@ package org.anjocaido.groupmanager.data;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.List;
+
 import org.anjocaido.groupmanager.GroupManager;
 import org.anjocaido.groupmanager.dataholder.WorldDataHolder;
 import org.anjocaido.groupmanager.utils.StringPermissionComparator;
@@ -18,7 +20,7 @@ public abstract class DataUnit {
 
     private WorldDataHolder dataSource;
     private String name;
-    private boolean changed;
+    private boolean changed, sorted = false;
     private ArrayList<String> permissions = new ArrayList<String>();
 
     public DataUnit(WorldDataHolder dataSource, String name) {
@@ -91,6 +93,7 @@ public abstract class DataUnit {
 // for(StackTraceElement st: Thread.currentThread().getStackTrace()){
 // GroupManager.logger.finest(st.toString());
 // }
+        sorted = false;
         changed = true;
     }
 
@@ -132,11 +135,18 @@ public abstract class DataUnit {
      * You can't edit the permissions using the returned ArrayList instance
      * @return a copy of the permission list
      */
-    public ArrayList<String> getPermissionList() {
+    public List<String> getPermissionList() {
-        return new ArrayList<String>(permissions);
+        return Collections.unmodifiableList(permissions);
+    }
+    
+    public boolean isSorted() {
+    	return this.sorted;
     }
 
     public void sortPermissions() {
+        if (!isSorted()) {
         	Collections.sort(permissions, StringPermissionComparator.getInstance());
+        	sorted = true;
+        }
     }
 }

EssentialsGroupManager/src/org/anjocaido/groupmanager/data/Group.java

@@ -7,6 +7,8 @@ package org.anjocaido.groupmanager.data;
 import org.anjocaido.groupmanager.GroupManager;
 import org.anjocaido.groupmanager.dataholder.WorldDataHolder;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -92,13 +94,13 @@ public class Group extends DataUnit implements Cloneable {
     }
 
     /**
-     * a COPY of inherits list
+     * an unmodifiable list of inherits list
      * You can't manage the list by here
      * Lol... version 0.6 had a problem because this.
      * @return the inherits
      */
-    public ArrayList<String> getInherits() {
+    public List<String> getInherits() {
-        return new ArrayList<String>(inherits);
+        return Collections.unmodifiableList(inherits);
     }
 
     /**

EssentialsGroupManager/src/org/anjocaido/groupmanager/data/User.java

@@ -10,6 +10,9 @@ import java.util.ArrayList;
 import org.anjocaido.groupmanager.GroupManager;
 import org.anjocaido.groupmanager.dataholder.WorldDataHolder;
 import java.util.Map;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
 
 /**
  * 
@@ -23,11 +26,11 @@ public class User extends DataUnit implements Cloneable {
 	private String group = null;
 	private ArrayList<String> subGroups = new ArrayList<String>();
 	/**
-     *This one holds the fields in INFO node.
+	 * This one holds the fields in INFO node. like prefix = 'c' or build =
-     * like prefix = 'c'
+	 * false
-     * or build = false
 	 */
 	private UserVariables variables = new UserVariables(this);
+	private transient Player bukkitPlayer = null;
 
 	/**
 	 * 
@@ -49,13 +52,14 @@ public class User extends DataUnit implements Cloneable {
 		for (String perm : this.getPermissionList()) {
 			clone.addPermission(perm);
 		}
-        //clone.variables = this.variables.clone();
+		// clone.variables = this.variables.clone();
-        //clone.flagAsChanged();
+		// clone.flagAsChanged();
 		return clone;
 	}
 
 	/**
 	 * Use this to deliver a user from one WorldDataHolder to another
+	 * 
 	 * @param dataSource
 	 * @return null if given dataSource already contains the same user
 	 */
@@ -72,7 +76,7 @@ public class User extends DataUnit implements Cloneable {
 		for (String perm : this.getPermissionList()) {
 			clone.addPermission(perm);
 		}
-        //clone.variables = this.variables.clone();
+		// clone.variables = this.variables.clone();
 		clone.flagAsChanged();
 		return clone;
 	}
@@ -98,19 +102,21 @@ public class User extends DataUnit implements Cloneable {
 	}
 
 	/**
-     * @param group the group to set
+	 * @param group
+	 *            the group to set
 	 */
 	@Deprecated
 	public void setGroup(String group) {
 		this.group = group;
 		flagAsChanged();
 		if (GroupManager.isLoaded())
-        	if(GroupManager.BukkitPermissions.player_join = false)
+			if (GroupManager.BukkitPermissions.player_join = false)
 				GroupManager.BukkitPermissions.updateAllPlayers();
 	}
 
 	/**
-     * @param group the group to set
+	 * @param group
+	 *            the group to set
 	 */
 	public void setGroup(Group group) {
 		if (!this.getDataSource().groupExists(group.getName())) {
@@ -127,10 +133,12 @@ public class User extends DataUnit implements Cloneable {
 			// Do we notify of the group change?
 			String defaultGroupName = getDataSource().getDefaultGroup().getName();
 			// if we were not in the default group
-            // or we were in the default group and the move is to a different group.
+			// or we were in the default group and the move is to a different
-            boolean notify = (!oldGroup.equalsIgnoreCase(defaultGroupName)) || ((oldGroup.equalsIgnoreCase(defaultGroupName)) && (!this.group.equalsIgnoreCase(defaultGroupName))) ;
+			// group.
+			boolean notify = (!oldGroup.equalsIgnoreCase(defaultGroupName)) || ((oldGroup.equalsIgnoreCase(defaultGroupName)) && (!this.group.equalsIgnoreCase(defaultGroupName)));
 
-        	if (notify) GroupManager.notify(this.getName(), String.format(" moved to the group %s.", group.getName()));
+			if (notify)
+				GroupManager.notify(this.getName(), String.format(" moved to the group %s.", group.getName()));
 		}
 	}
 
@@ -215,4 +223,19 @@ public class User extends DataUnit implements Cloneable {
 			if (GroupManager.BukkitPermissions.player_join = false)
 				GroupManager.BukkitPermissions.updateAllPlayers();
 	}
+
+	public User updatePlayer(Player player) {
+		if (player != null) {
+			bukkitPlayer = player;
+		}
+		return this;
+	}
+
+	public Player getBukkitPlayer() {
+		if (bukkitPlayer == null) {
+			bukkitPlayer = Bukkit.getPlayer(this.getName());
+		}
+		return bukkitPlayer;
+	}
+
 }

EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/OverloadedWorldHolder.java

@@ -44,12 +44,13 @@ public class OverloadedWorldHolder extends WorldDataHolder {
     @Override
     public User getUser(String userName) {
         //OVERLOADED CODE
-        if (overloadedUsers.containsKey(userName.toLowerCase())) {
+    	String userNameLowered = userName.toLowerCase();
-            return overloadedUsers.get(userName.toLowerCase());
+    	if (overloadedUsers.containsKey(userNameLowered)) {
+    		return overloadedUsers.get(userNameLowered);
         }
         //END CODE
-        if (users.containsKey(userName.toLowerCase())) {
+        if (users.containsKey(userNameLowered)) {
-            return users.get(userName.toLowerCase());
+            return users.get(userNameLowered);
         }
         User newUser = createUser(userName);
         haveUsersChanged = true;

EssentialsGroupManager/src/org/anjocaido/groupmanager/dataholder/worlds/WorldsHolder.java

@@ -268,9 +268,10 @@ public class WorldsHolder {
      * @return OverloadedWorldHolder
      */
     public OverloadedWorldHolder getWorldData(String worldName) {
-        OverloadedWorldHolder data = worldsData.get(worldName.toLowerCase());
+    	String worldNameLowered = worldName.toLowerCase();
-        if (mirrors.containsKey(worldName.toLowerCase())) {
+    	OverloadedWorldHolder data = worldsData.get(worldNameLowered);
-            String realOne = mirrors.get(worldName.toLowerCase());
+    	if (mirrors.containsKey(worldNameLowered)) {
+    		String realOne = mirrors.get(worldNameLowered);
             data = worldsData.get(realOne.toLowerCase());
         }
         if (data == null) {

EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java

@@ -8,7 +8,7 @@ import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.StringTokenizer;
+
 import org.anjocaido.groupmanager.GroupManager;
 import org.anjocaido.groupmanager.data.Group;
 import org.anjocaido.groupmanager.dataholder.WorldDataHolder;
@@ -17,6 +17,7 @@ import org.anjocaido.groupmanager.utils.PermissionCheckResult;
 import org.anjocaido.groupmanager.utils.PermissionCheckResult.Type;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
+import org.bukkit.permissions.Permission;
 
 /**
  * Everything here maintains the model created by Nijikokun
@@ -62,7 +63,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 */
 	@Override
 	public boolean permission(Player player, String permission) {
-		return checkUserPermission(ph.getUser(player.getName()), permission);
+		return checkUserPermission(ph.getUser(player.getName()).updatePlayer(player), permission);
 	}
 
 	/**
@@ -97,43 +98,60 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	@Override
 	public List<String> getAllPlayersPermissions(String userName) {
 
-		List<String> playerPermArray = new ArrayList<String>(ph.getUser(userName).getPermissionList());
+		List<String> playerPermArray = new ArrayList<String>();
 
+		for (String perm : ph.getUser(userName).getPermissionList()) {
+			if ((!playerPermArray.contains(perm)) && (!playerPermArray.contains("-" + perm))) {
+				playerPermArray.add(perm);
+
+				Map<String, Boolean> children = GroupManager.BukkitPermissions.getAllChildren(perm, playerPermArray);
+
+				if (children != null) {
+					for (String child : children.keySet()) {
+						if (children.get(child))
+							if ((!playerPermArray.contains(child)) && (!playerPermArray.contains("-" + child))) {
+								playerPermArray.add(child);
+							}
+					}
+				}
+			}
+		}
 		for (String group : getGroups(userName)) {
 			if (group.startsWith("g:") && GroupManager.getGlobalGroups().hasGroup(group)) {
 				for (String perm : GroupManager.getGlobalGroups().getGroupsPermissions(group)) {
 					if ((!playerPermArray.contains(perm)) && (!playerPermArray.contains("-" + perm))) {
 						playerPermArray.add(perm);
 
-						Map<String, Boolean> children = GroupManager.BukkitPermissions.getChildren(perm);
+						Map<String, Boolean> children = GroupManager.BukkitPermissions.getAllChildren(perm, playerPermArray);
 						if (children != null) {
 							for (String child : children.keySet()) {
 								if (children.get(child))
-									if ((!playerPermArray.contains(perm)) && (!playerPermArray.contains("-" + perm)))
+									if ((!playerPermArray.contains(child)) && (!playerPermArray.contains("-" + child)))
 										playerPermArray.add(child);
 							}
 						}
 					}
 				}
-
 			} else {
 				for (String perm : ph.getGroup(group).getPermissionList()) {
 					if ((!playerPermArray.contains(perm)) && (!playerPermArray.contains("-" + perm))) {
 						playerPermArray.add(perm);
 
-						Map<String, Boolean> children = GroupManager.BukkitPermissions.getChildren(perm);
+						Map<String, Boolean> children = GroupManager.BukkitPermissions.getAllChildren(perm, playerPermArray);
 						if (children != null) {
 							for (String child : children.keySet()) {
 								if (children.get(child))
-									if ((!playerPermArray.contains(perm)) && (!playerPermArray.contains("-" + perm)))
+									if ((!playerPermArray.contains(child)) && (!playerPermArray.contains("-" + child))) {
 										playerPermArray.add(child);
 									}
 							}
-
 						}
 					}
 				}
 			}
+		}
+		// Collections.sort(playerPermArray,
+		// StringPermissionComparator.getInstance());
 
 		return playerPermArray;
 	}
@@ -227,7 +245,8 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	/**
 	 * Check if user can build. Checks inheritance and subgroups.
 	 * 
-	 * @param userName Player's name    
+	 * @param userName
+	 *            Player's name
 	 * @return true if the user can build
 	 */
 	public boolean canUserBuild(String userName) {
@@ -267,8 +286,8 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	}
 
 	/**
-	 * Checks the specified group for the Info Build node.
+	 * Checks the specified group for the Info Build node. Does NOT check
-	 * Does NOT check inheritance
+	 * inheritance
 	 * 
 	 * @param groupName
 	 * @return true if can build
@@ -599,15 +618,8 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 		result.askedPermission = permission;
 		result.owner = user;
 		for (String access : user.getPermissionList()) {
-			if (comparePermissionString(access, permission)) {
+			result.resultType = comparePermissionString(access, permission);
-				result.accessLevel = access;
+			if (result.resultType != PermissionCheckResult.Type.NOTFOUND) {
-				if (access.startsWith("-")) {
-					result.resultType = PermissionCheckResult.Type.NEGATION;
-				} else if (access.startsWith("+")) {
-					result.resultType = PermissionCheckResult.Type.EXCEPTION;
-				} else {
-					result.resultType = PermissionCheckResult.Type.FOUND;
-				}
 				return result;
 			}
 		}
@@ -629,15 +641,8 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 		result.owner = group;
 		result.askedPermission = permission;
 		for (String access : group.getPermissionList()) {
-			if (comparePermissionString(access, permission)) {
+			result.resultType = comparePermissionString(access, permission);
-				result.accessLevel = access;
+			if (result.resultType != PermissionCheckResult.Type.NOTFOUND) {
-				if (access.startsWith("-")) {
-					result.resultType = PermissionCheckResult.Type.NEGATION;
-				} else if (access.startsWith("+")) {
-					result.resultType = PermissionCheckResult.Type.EXCEPTION;
-				} else {
-					result.resultType = PermissionCheckResult.Type.FOUND;
-				}
 				return result;
 			}
 		}
@@ -653,12 +658,10 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 * @return true if permission was found. false if not, or was negated.
 	 */
 	public boolean checkUserPermission(User user, String permission) {
-		PermissionCheckResult result = checkFullUserPermission(user, permission);
+		PermissionCheckResult result = checkFullGMPermission(user, permission, true);
-		if (result.resultType.equals(PermissionCheckResult.Type.EXCEPTION) || result.resultType.equals(PermissionCheckResult.Type.FOUND)) {
+		if (result.resultType == PermissionCheckResult.Type.EXCEPTION || result.resultType == PermissionCheckResult.Type.FOUND) {
 			return true;
 		}
-		if ((Bukkit.getPlayer(user.getName()) != null) && (Bukkit.getPlayer(user.getName()).hasPermission(permission)))
-			return true;
 
 		return false;
 	}
@@ -672,39 +675,59 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 * @return PermissionCheckResult
 	 */
 	public PermissionCheckResult checkFullUserPermission(User user, String targetPermission) {
+
+		return checkFullGMPermission(user, targetPermission, true);
+	}
+
+	/**
+	 * Check user and groups with inheritance and Bukkit if bukkit = true return
+	 * a PermissionCheckResult.
+	 * 
+	 * @param user
+	 * @param targetPermission
+	 * @param checkBukkit
+	 * @return PermissionCheckResult
+	 */
+	public PermissionCheckResult checkFullGMPermission(User user, String targetPermission, Boolean checkBukkit) {
 		PermissionCheckResult result = new PermissionCheckResult();
-		result.askedPermission = targetPermission;
+		result.accessLevel = targetPermission;
 		result.resultType = PermissionCheckResult.Type.NOTFOUND;
 
 		if (user == null || targetPermission == null || targetPermission.isEmpty()) {
 			return result;
 		}
 
+		if (checkBukkit) {
+			// Check Bukkit perms to support plugins which add perms via code
+			// (Heroes).
+			final Player player = user.getBukkitPlayer();
+			final Permission bukkitPerm = Bukkit.getPluginManager().getPermission(targetPermission);
+			if (player != null && bukkitPerm != null) {
+				result.resultType = player.hasPermission(bukkitPerm) ? PermissionCheckResult.Type.FOUND : PermissionCheckResult.Type.NEGATION;
+				result.owner = user;
+				return result;
+			}
+		}
+
 		PermissionCheckResult resultUser = checkUserOnlyPermission(user, targetPermission);
-		if (!resultUser.resultType.equals(PermissionCheckResult.Type.NOTFOUND)) {
+		if (resultUser.resultType != PermissionCheckResult.Type.NOTFOUND) {
 			return resultUser;
 		}
 
 		// IT ONLY CHECKS GROUPS PERMISSIONS IF RESULT FOR USER IS NOT FOUND
 		PermissionCheckResult resultGroup = checkGroupPermissionWithInheritance(user.getGroup(), targetPermission);
-		if (!resultGroup.resultType.equals(PermissionCheckResult.Type.NOTFOUND)) {
+		if (resultGroup.resultType != PermissionCheckResult.Type.NOTFOUND) {
 			return resultGroup;
 		}
 
 		// SUBGROUPS CHECK
 		for (Group subGroup : user.subGroupListCopy()) {
 			PermissionCheckResult resultSubGroup = checkGroupPermissionWithInheritance(subGroup, targetPermission);
-			if (!resultSubGroup.resultType.equals(PermissionCheckResult.Type.NOTFOUND)) {
+			if (resultSubGroup.resultType != PermissionCheckResult.Type.NOTFOUND) {
 				return resultSubGroup;
 			}
 		}
 
-		if ((Bukkit.getPlayer(user.getName()) != null) && (Bukkit.getPlayer(user.getName()).hasPermission(targetPermission))) {
-			result.resultType = PermissionCheckResult.Type.FOUND;
-			result.owner = user;
-			return result;
-		}
-
 		// THEN IT RETURNS A NOT FOUND
 		return result;
 	}
@@ -960,53 +983,43 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
 	 * Every '-' or '+' in the beginning is ignored. It will match only node
 	 * names.
 	 * 
-	 * @param userAcessLevel
+	 * @param userAccessLevel
 	 * @param fullPermissionName
-	 * @return true if found a matching token. false if not.
+	 * @return PermissionCheckResult.Type
 	 */
-	public boolean comparePermissionString(String userAcessLevel, String fullPermissionName) {
+	public PermissionCheckResult.Type comparePermissionString(String userAccessLevel, String fullPermissionName) {
-		if (userAcessLevel == null || fullPermissionName == null) {
+		int userAccessLevelLength;
-			return false;
+		if (userAccessLevel == null || fullPermissionName == null || fullPermissionName.length() == 0 || (userAccessLevelLength = userAccessLevel.length()) == 0) {
-		}
+			return PermissionCheckResult.Type.NOTFOUND;
-		GroupManager.logger.finest("COMPARING " + userAcessLevel + " WITH " + fullPermissionName);
-
-		if (userAcessLevel.startsWith("+")) {
-			userAcessLevel = userAcessLevel.substring(1);
-		} else if (userAcessLevel.startsWith("-")) {
-			userAcessLevel = userAcessLevel.substring(1);
 		}
 
-		if (fullPermissionName.startsWith("+")) {
+		PermissionCheckResult.Type result = PermissionCheckResult.Type.FOUND;
-			fullPermissionName = fullPermissionName.substring(1);
+		int userAccessLevelOffset = 0;
-		} else if (fullPermissionName.startsWith("-")) {
+		if (userAccessLevel.charAt(0) == '+') {
-			fullPermissionName = fullPermissionName.substring(1);
+			userAccessLevelOffset = 1;
+			result = PermissionCheckResult.Type.EXCEPTION;
+		} else if (userAccessLevel.charAt(0) == '-') {
+			userAccessLevelOffset = 1;
+			result = PermissionCheckResult.Type.NEGATION;
 		}
-
+		if ("*".regionMatches(0, userAccessLevel, userAccessLevelOffset, userAccessLevelLength - userAccessLevelOffset)) {
-		StringTokenizer levelATokenizer = new StringTokenizer(userAcessLevel, ".");
+			return result;
-		StringTokenizer levelBTokenizer = new StringTokenizer(fullPermissionName, ".");
-		while (levelATokenizer.hasMoreTokens() && levelBTokenizer.hasMoreTokens()) {
-			String levelA = levelATokenizer.nextToken();
-			String levelB = levelBTokenizer.nextToken();
-			GroupManager.logger.finest("ROUND " + levelA + " AGAINST " + levelB);
-			if (levelA.contains("*")) {
-				GroupManager.logger.finest("WIN");
-				return true;
 		}
-			if (levelA.equalsIgnoreCase(levelB)) {
+		int fullPermissionNameOffset;
-				if (!levelATokenizer.hasMoreTokens() && !levelBTokenizer.hasMoreTokens()) {
+		if (fullPermissionName.charAt(0) == '+' || fullPermissionName.charAt(0) == '-') {
-					GroupManager.logger.finest("WIN");
+			fullPermissionNameOffset = 1;
-					return true;
-				}
-				GroupManager.logger.finest("NEXT");
-				continue;
 		} else {
-				GroupManager.logger.finest("FAIL");
+			fullPermissionNameOffset = 0;
-				return false;
 		}
 
+		if (userAccessLevel.charAt(userAccessLevel.length() - 1) == '*') {
+			return userAccessLevel.regionMatches(true, userAccessLevelOffset, fullPermissionName, fullPermissionNameOffset, userAccessLevelLength - userAccessLevelOffset - 1) ?
+					result : PermissionCheckResult.Type.NOTFOUND;
+		} else {
+			return userAccessLevel.regionMatches(true, userAccessLevelOffset, fullPermissionName, fullPermissionNameOffset,
+					Math.max(userAccessLevelLength - userAccessLevelOffset, fullPermissionName.length() - fullPermissionNameOffset)) ?
+							result : PermissionCheckResult.Type.NOTFOUND;
 		}
-		GroupManager.logger.finest("FAIL");
-		return false;
 	}
 
 	/**

EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java

@@ -18,14 +18,14 @@ package org.anjocaido.groupmanager.permissions;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.HashSet;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 
 import org.anjocaido.groupmanager.GroupManager;
 import org.anjocaido.groupmanager.data.User;
 import org.anjocaido.groupmanager.dataholder.OverloadedWorldHolder;
+import org.anjocaido.groupmanager.utils.PermissionCheckResult;
 
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -57,7 +57,7 @@ import org.bukkit.plugin.PluginManager;
 public class BukkitPermissions {
 
 	protected Map<Player, PermissionAttachment> attachments = new HashMap<Player, PermissionAttachment>();
-    protected Set<Permission> registeredPermissions = new HashSet<Permission>();
+	protected LinkedList<Permission> registeredPermissions = new LinkedList<Permission>();
 	protected GroupManager plugin;
 	protected boolean dumpAllPermissions = true;
 	protected boolean dumpMatchedPermissions = true;
@@ -96,12 +96,12 @@ public class BukkitPermissions {
 	public void collectPermissions() {
 		registeredPermissions.clear();
 		for (Plugin bukkitPlugin : Bukkit.getServer().getPluginManager().getPlugins()) {
-        	for(Permission permission : bukkitPlugin.getDescription().getPermissions())
+			for (Permission permission : bukkitPlugin.getDescription().getPermissions())
-            registeredPermissions.add(permission);
+				registeredPermissions.push(permission);
 		}
 	}
 
-    public void updatePermissions(Player player){
+	public void updatePermissions(Player player) {
 		this.updatePermissions(player, null);
 	}
 
@@ -114,7 +114,7 @@ public class BukkitPermissions {
 			this.attachments.put(player, player.addAttachment(plugin));
 		}
 
-        if(world == null){
+		if (world == null) {
 			world = player.getWorld().getName();
 		}
 
@@ -132,41 +132,53 @@ public class BukkitPermissions {
 		/*
 		 * find matching permissions
 		 * 
-         *  and base bukkit perms if we are set to allow bukkit permissions to override.
+		 * and base bukkit perms if we are set to allow bukkit permissions to
+		 * override.
 		 */
-        Boolean value;
+		Boolean value = false;
+				
 		for (Permission permission : registeredPermissions) {
 			
-        	value =  worldData.getPermissionsHandler().checkUserPermission(user, permission.getName());
+			PermissionCheckResult result = worldData.getPermissionsHandler().checkFullGMPermission(user, permission.getName(), false);
 
-        	// Only check bukkit override IF we don't have the permission directly.
+			// Only check bukkit override IF we don't have the permission
-        	if (value = false) {
+			// directly.
+			if (result.resultType == PermissionCheckResult.Type.NOTFOUND) {
 				PermissionDefault permDefault = permission.getDefault();
 
-	        	if ((plugin.getGMConfig().isBukkitPermsOverride())
+				if ((plugin.getGMConfig().isBukkitPermsOverride()) && ((permDefault == PermissionDefault.TRUE)
-	        	&& ((permDefault == PermissionDefault.TRUE)
 						|| ((permDefault == PermissionDefault.NOT_OP) && !player.isOp())
-	        		|| ((permDefault == PermissionDefault.OP) && player.isOp())))
+						|| ((permDefault == PermissionDefault.OP) && player.isOp()))) {
+					value = true;
+				} else {
+					value = false;
+				}
+			} else if (result.resultType == PermissionCheckResult.Type.NEGATION) {
+				value = false;
+			} else {
 				value = true;
 			}
 
-        	if (value == true){
 			// Set the root permission
+			if ((value == true) || (result.resultType == PermissionCheckResult.Type.NEGATION)) {
 				attachment.setPermission(permission, value);
+			}
+			/*
+			if ((value == true) || (result.resultType == PermissionCheckResult.Type.NOTFOUND)) {
 				// fetch and set all children of this permission node
 				Map<String, Boolean> children = permission.getChildren();
 				if (children != null) {
 					for (String child : children.keySet()) {
 						if (children.get(child))
-                    		attachment.setPermission(child, true);
+							attachment.setPermission(child, value);
 					}
 				}
+			}*/
 
 		}
-        }
 
-        // Add any missing permissions for this player (non bukkit plugins)
+		// Add any missing permissions for this player (non bukkit plugins and child nodes)
-        List<String> playerPermArray = new ArrayList<String>(worldData.getPermissionsHandler().getAllPlayersPermissions(player.getName()));
+		List<String> playerPermArray = worldData.getPermissionsHandler().getAllPlayersPermissions(player.getName());
 
 		for (String permission : playerPermArray) {
 			value = true;
@@ -183,7 +195,41 @@ public class BukkitPermissions {
 	}
 
 	/**
-     * Returns a map of the child permissions as defined by the supplying plugin
+	 * Returns a map of the ALL child permissions as defined by the supplying plugin
+	 * null is empty
+	 * 
+	 * @param node
+	 * @return Map of child permissions
+	 */
+	public Map<String, Boolean> getAllChildren(String node, List<String> playerPermArray) {
+		
+		LinkedList<String> stack = new LinkedList<String>();
+		Map<String, Boolean> alreadyVisited = new HashMap<String, Boolean>();
+		stack.push(node);
+		alreadyVisited.put(node, true);
+		
+		while (!stack.isEmpty()) {
+			String now = stack.pop();
+			
+			Map<String, Boolean> children = getChildren(now);
+			
+			if ((children != null) && (!playerPermArray.contains("-"+now))) {
+				for (String childName : children.keySet()) {
+					if (!alreadyVisited.containsKey(childName)) {
+						stack.push(childName);
+						alreadyVisited.put(childName, children.get(childName));
+					}
+				}
+			}
+		}
+		alreadyVisited.remove(node);
+		if (!alreadyVisited.isEmpty()) return alreadyVisited;
+		
+		return null;
+	}
+		
+	/**
+	 * Returns a map of the child permissions (1 node deep) as defined by the supplying plugin
 	 * null is empty
 	 * 
 	 * @param node
@@ -191,10 +237,11 @@ public class BukkitPermissions {
 	 */
 	public Map<String, Boolean> getChildren(String node) {
 		for (Permission permission : registeredPermissions) {
-    		if (permission.getName() == node) {
+			if (permission.getName().equalsIgnoreCase(node)) {
 				return permission.getChildren();
 			}
 		}
+		
 		return null;
 	}
 
@@ -202,18 +249,17 @@ public class BukkitPermissions {
 		List<String> perms = new ArrayList<String>();
 
 		/*
-    	// All permissions registered with Bukkit for this player
+		 * // All permissions registered with Bukkit for this player
-        PermissionAttachment attachment = this.attachments.get(player);
+		 * PermissionAttachment attachment = this.attachments.get(player);
-    	
+		 * 
-    	// List perms for this player
+		 * // List perms for this player perms.add("Attachment Permissions:");
-    	perms.add("Attachment Permissions:");
+		 * for(Map.Entry<String, Boolean> entry :
-        for(Map.Entry<String, Boolean> entry : attachment.getPermissions().entrySet()){
+		 * attachment.getPermissions().entrySet()){ perms.add(" " +
-        	perms.add(" " + entry.getKey() + " = " + entry.getValue());
+		 * entry.getKey() + " = " + entry.getValue()); }
-        }
 		 */
 
 		perms.add("Effective Permissions:");
-        for(PermissionAttachmentInfo info : player.getEffectivePermissions()){
+		for (PermissionAttachmentInfo info : player.getEffectivePermissions()) {
 			if (info.getValue() == true)
 				perms.add(" " + info.getPermission() + " = " + info.getValue());
 		}
@@ -232,7 +278,7 @@ public class BukkitPermissions {
 		public void onPlayerJoin(PlayerJoinEvent event) {
 			player_join = true;
 			Player player = event.getPlayer();
-        	//force GM to create the player if they are not already listed.
+			// force GM to create the player if they are not already listed.
 			if (plugin.getWorldsHolder().getWorldData(player.getWorld().getName()).getUser(player.getName()) != null) {
 				player_join = false;
 				updatePermissions(event.getPlayer());
@@ -242,7 +288,7 @@ public class BukkitPermissions {
 
 		@Override
 		public void onPlayerPortal(PlayerPortalEvent event) { // will portal into another world
-            if(event.getTo() != null && !event.getFrom().getWorld().equals(event.getTo().getWorld())){ // only if world actually changed
+			if (event.getTo() != null && !event.getFrom().getWorld().equals(event.getTo().getWorld())) { // only if world actually changed
 				updatePermissions(event.getPlayer(), event.getTo().getWorld().getName());
 			}
 		}
@@ -286,8 +332,8 @@ public class BukkitPermissions {
 
 		@Override
 		public void onPluginDisable(PluginDisableEvent event) {
-            //collectPermissions();
+			// collectPermissions();
-            //updateAllPlayers();
+			// updateAllPlayers();
 		}
 	}