Fix for GM not checking inheritance for known superperms nodes.

2 files changed, 4 insertions, 24 deletions

diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt
index cded4ceb8..0eac3c14c 100644
--- a/EssentialsGroupManager/src/Changelog.txt
+++ b/EssentialsGroupManager/src/Changelog.txt
@@ -19,4 +19,5 @@ v 1.1:
     - manulistp now accepts an additional + to list ALL Superperms effective permissions (/manulistp <name> +).

     - manucheckp also outputs superperms results.

     - Removed superperms update on plugins unloading. Unneeded and created undesired lag on shutdown.

-    - Added a BukkitPermsUpdateTask to only update superperms once on a load/reload.
\ No newline at end of file
+    - Added a BukkitPermsUpdateTask to only update superperms once on a load/reload.

+    - Fix for GM not checking inheritance for known superperms nodes.
\ No newline at end of file
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
index 1c2aa8fb7..affa72c78 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/BukkitPermissions.java
@@ -16,8 +16,6 @@
 

 package org.anjocaido.groupmanager.permissions;

 

-import java.io.PrintWriter;

-import java.io.StringWriter;

 import java.util.ArrayList;

 import java.util.HashMap;

 import java.util.HashSet;

@@ -28,7 +26,6 @@ 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;

@@ -134,15 +131,10 @@ public class BukkitPermissions {
         }      

         

         // find matching permissions

-        PermissionCheckResult permissionResult;

         Boolean value;

         for (Permission permission : registeredPermissions) {

-        	permissionResult = worldData.getPermissionsHandler().checkFullUserPermission(user, permission.getName());

-            if (permissionResult.resultType.equals(PermissionCheckResult.Type.FOUND))

-            	value = true;

-            else

-            	value = false;

-        	

+        	value = worldData.getPermissionsHandler().checkUserPermission(user, permission.getName());

+

             attachment.setPermission(permission, value);

         }

         

@@ -161,19 +153,6 @@ public class BukkitPermissions {
             }

         }

         player.recalculatePermissions();

-        

-        /*

-        // List perms for this player

-        GroupManager.logger.info("Attachment Permissions:");

-        for(Map.Entry<String, Boolean> entry : attachment.getPermissions().entrySet()){

-        	GroupManager.logger.info(" " + entry.getKey() + " = " + entry.getValue());

-        }

-

-        GroupManager.logger.info("Effective Permissions:");

-        for(PermissionAttachmentInfo info : player.getEffectivePermissions()){

-        	GroupManager.logger.info(" " + info.getPermission() + " = " + info.getValue());

-        }

-		*/

     }

     

     public List<String> listPerms(Player player) {