From dec7ea19268d0e4624c3bbb7da0f3a1b52e69c72 Mon Sep 17 00:00:00 2001
From: ElgarL <ElgarL@palmergames.com>
Date: Thu, 24 Nov 2011 14:05:25 +0000
Subject: remove bukkit perms check from checkUserPermission as it's performed
 in checkFullUserPermission

---
 .../org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'EssentialsGroupManager')

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;
-- 
cgit v1.2.3