diff options
| author | ElgarL <ElgarL@palmergames.com> | 2011-11-24 14:05:25 +0000 |
|---|---|---|
| committer | ElgarL <ElgarL@palmergames.com> | 2011-11-24 14:05:25 +0000 |
| commit | dec7ea19268d0e4624c3bbb7da0f3a1b52e69c72 (patch) | |
| tree | 721a2c973926af48211f4edab6a186d5b6888ee0 /EssentialsGroupManager | |
| parent | 94983c3ca75317a2c6c7e0c8ca88b4f2a2ad0f4c (diff) | |
| download | Essentials-dec7ea19268d0e4624c3bbb7da0f3a1b52e69c72.tar Essentials-dec7ea19268d0e4624c3bbb7da0f3a1b52e69c72.tar.gz Essentials-dec7ea19268d0e4624c3bbb7da0f3a1b52e69c72.tar.lz Essentials-dec7ea19268d0e4624c3bbb7da0f3a1b52e69c72.tar.xz Essentials-dec7ea19268d0e4624c3bbb7da0f3a1b52e69c72.zip | |
remove bukkit perms check from checkUserPermission as it's performed in
checkFullUserPermission
Diffstat (limited to 'EssentialsGroupManager')
| -rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java index b858c2a6c..feec3f17f 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java @@ -657,8 +657,6 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface { if (result.resultType.equals(PermissionCheckResult.Type.EXCEPTION) || result.resultType.equals(PermissionCheckResult.Type.FOUND)) { return true; } - if ((Bukkit.getPlayer(user.getName()) != null) && (Bukkit.getPlayer(user.getName()).hasPermission(permission))) - return true; return false; } @@ -699,6 +697,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface { } } + // Check Bukkit perms to support plugins which add perms via code (Heroes). if ((Bukkit.getPlayer(user.getName()) != null) && (Bukkit.getPlayer(user.getName()).hasPermission(targetPermission))) { result.resultType = PermissionCheckResult.Type.FOUND; result.owner = user; |