summaryrefslogtreecommitdiffstats
path: root/EssentialsGroupManager/src/org/anjocaido/groupmanager
diff options
context:
space:
mode:
authorElgarL <ElgarL@palmergames.com>2011-11-03 20:42:34 +0000
committerElgarL <ElgarL@palmergames.com>2011-11-03 20:42:34 +0000
commiteba96c110b0548183848623cadde035753d21c3a (patch)
tree45c3338c5cb1d6dcb4400fc4a72a905fd1eafb9a /EssentialsGroupManager/src/org/anjocaido/groupmanager
parent5ef08d2250d1032d8c06031b02e8403a703f1c58 (diff)
downloadEssentials-eba96c110b0548183848623cadde035753d21c3a.tar
Essentials-eba96c110b0548183848623cadde035753d21c3a.tar.gz
Essentials-eba96c110b0548183848623cadde035753d21c3a.tar.lz
Essentials-eba96c110b0548183848623cadde035753d21c3a.tar.xz
Essentials-eba96c110b0548183848623cadde035753d21c3a.zip
Fix for an error in checkFullUserPermission caused by players
disconnecting mid perms update.
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager')
-rw-r--r--EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java
index 3546c757e..e8911b4a8 100644
--- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java
+++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java
@@ -658,7 +658,7 @@ 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()).hasPermission(permission))
+ if ((Bukkit.getPlayer(user.getName()) != null) && (Bukkit.getPlayer(user.getName()).hasPermission(permission)))
return true;
return false;
@@ -700,7 +700,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
}
}
- if (Bukkit.getPlayer(user.getName()).hasPermission(targetPermission)) {
+ if ((Bukkit.getPlayer(user.getName()) != null) && (Bukkit.getPlayer(user.getName()).hasPermission(targetPermission))) {
result.resultType = PermissionCheckResult.Type.FOUND;
result.owner = user;
return result;