minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-13 18:14:38 +02:00
Code Issues Releases Wiki Activity

remove bukkit perms check from checkUserPermission as it's performed in

Browse Source 
checkFullUserPermission
This commit is contained in:
ElgarL
2011-11-24 14:05:25 +00:00
parent 94983c3ca7
commit dec7ea1926
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java
View File

@@ -657,8 +657,6 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
if (result.resultType.equals(PermissionCheckResult.Type.EXCEPTION) || result.resultType.equals(PermissionCheckResult.Type.FOUND)) { if (result.resultType.equals(PermissionCheckResult.Type.EXCEPTION) || result.resultType.equals(PermissionCheckResult.Type.FOUND)) {
return true; return true;
} }
if ((Bukkit.getPlayer(user.getName()) != null) && (Bukkit.getPlayer(user.getName()).hasPermission(permission)))
return true;
return false; 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))) { if ((Bukkit.getPlayer(user.getName()) != null) && (Bukkit.getPlayer(user.getName()).hasPermission(targetPermission))) {
result.resultType = PermissionCheckResult.Type.FOUND; result.resultType = PermissionCheckResult.Type.FOUND;
result.owner = user; result.owner = user;