From 5ef08d2250d1032d8c06031b02e8403a703f1c58 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Thu, 3 Nov 2011 20:29:30 +0000 Subject: Fix for an error in checkFullUserPermission caused by silly requests for a null perm. --- EssentialsGroupManager/src/Changelog.txt | 3 ++- .../org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index b0d68e24c..a8e7a772a 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -68,4 +68,5 @@ v 1.5: - GM will now check to see if it's data files have been changed at each scheduled save. 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. \ No newline at end of file + 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. \ No newline at end of file diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java index e7ece0575..3546c757e 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java @@ -677,7 +677,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface { result.askedPermission = targetPermission; result.resultType = PermissionCheckResult.Type.NOTFOUND; - if (user == null || targetPermission == null) { + if (user == null || targetPermission == null || targetPermission.isEmpty()) { return result; } -- cgit v1.2.3