Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-23 17:47:34 +01:00
Code Issues Projects Releases Wiki Activity

Fix for an error in checkFullUserPermission caused by players

Browse Source 
disconnecting mid perms update.
This commit is contained in:
ElgarL 2011-11-03 20:42:34 +00:00
parent 87ccd7bf46
commit 5560ab4294
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EssentialsGroupManager/src/Changelog.txt
View File

@ -69,4 +69,4 @@ v 1.5:
If the files have been altered (on disc) it will reload, so long as the in-memory data hasn't changed.
If the files on Disc have changed AND there have been changes to it's in-memory data it will show a warning.
You then MUST issue a '/mansave force' to overwrite the disc files, or a '/manload' to overwrite the memory data.
- Fix for an error in checkFullUserPermission caused by silly requests for a null perm.
- Fix for an error in checkFullUserPermission caused by players disconnecting mid perms update.

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

@ -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;