diff options
| author | ElgarL <ElgarL@palmergames.com> | 2012-03-03 13:00:17 +0000 |
|---|---|---|
| committer | ElgarL <ElgarL@palmergames.com> | 2012-03-03 13:00:17 +0000 |
| commit | 29fa09510f624ea08ae3c4d465329cbfa503c794 (patch) | |
| tree | 3782cff3d8a582ad7790edf7003fa88987de42ca /EssentialsGroupManager/src/org/anjocaido/groupmanager | |
| parent | 6f9654ea9b8ecfb91d9b308fb4a4cb936de83776 (diff) | |
| download | Essentials-29fa09510f624ea08ae3c4d465329cbfa503c794.tar Essentials-29fa09510f624ea08ae3c4d465329cbfa503c794.tar.gz Essentials-29fa09510f624ea08ae3c4d465329cbfa503c794.tar.lz Essentials-29fa09510f624ea08ae3c4d465329cbfa503c794.tar.xz Essentials-29fa09510f624ea08ae3c4d465329cbfa503c794.zip | |
Minor optimization when checking bukkit permissions.
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager')
| -rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java index bd2829f38..b9315e849 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java @@ -17,9 +17,7 @@ import org.anjocaido.groupmanager.dataholder.WorldDataHolder; import org.anjocaido.groupmanager.data.User; 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 @@ -767,9 +765,9 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface { // 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; + //final Permission bukkitPerm = Bukkit.getPluginManager().getPermission(targetPermission); + if (player != null && player.hasPermission(targetPermission)) { + result.resultType = PermissionCheckResult.Type.FOUND; result.owner = user; return result; } |