diff options
| author | ElgarL <ElgarL@palmergames.com> | 2011-12-18 14:26:00 +0000 |
|---|---|---|
| committer | ElgarL <ElgarL@palmergames.com> | 2011-12-18 14:26:00 +0000 |
| commit | de40f7f556513d4997779f0c5cc1d77fe050a02a (patch) | |
| tree | 7b41fa8b53df73c03a2f68ec89a8d1b7a29b4a2b /EssentialsGroupManager | |
| parent | ac77bbb0b4f405598b8fc8271d520818d0646da9 (diff) | |
| download | Essentials-de40f7f556513d4997779f0c5cc1d77fe050a02a.tar Essentials-de40f7f556513d4997779f0c5cc1d77fe050a02a.tar.gz Essentials-de40f7f556513d4997779f0c5cc1d77fe050a02a.tar.lz Essentials-de40f7f556513d4997779f0c5cc1d77fe050a02a.tar.xz Essentials-de40f7f556513d4997779f0c5cc1d77fe050a02a.zip | |
Fixed 'manucheckp' returning a null for the searched node when it's a
group/subgroup.
Diffstat (limited to 'EssentialsGroupManager')
3 files changed, 7 insertions, 2 deletions
diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index 76782e99a..69f921bb3 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -87,4 +87,6 @@ v 1.7: - GM now registers with Bukkits ServicesManager.
- deleting the contents of GlobalGroups.yml will no longer thrown a NullPointerException.
- Removed op permissions from admins in the default GloblaGroups.yml.
- - Changed ServicesManager registration to lowest from normal.
\ No newline at end of file +v 1.8:
+ - Changed ServicesManager registration to lowest from normal.
+ - Fixed 'manucheckp' returning a null for the searched node when it's a group/subgroup.
\ 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 6e18bf3f8..9b7253c41 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java @@ -711,12 +711,14 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface { PermissionCheckResult resultUser = checkUserOnlyPermission(user, targetPermission); if (resultUser.resultType != PermissionCheckResult.Type.NOTFOUND) { + resultUser.accessLevel = targetPermission; return resultUser; } // IT ONLY CHECKS GROUPS PERMISSIONS IF RESULT FOR USER IS NOT FOUND PermissionCheckResult resultGroup = checkGroupPermissionWithInheritance(user.getGroup(), targetPermission); if (resultGroup.resultType != PermissionCheckResult.Type.NOTFOUND) { + result.accessLevel = targetPermission; return resultGroup; } @@ -724,6 +726,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface { for (Group subGroup : user.subGroupListCopy()) { PermissionCheckResult resultSubGroup = checkGroupPermissionWithInheritance(subGroup, targetPermission); if (resultSubGroup.resultType != PermissionCheckResult.Type.NOTFOUND) { + resultSubGroup.accessLevel = targetPermission; return resultSubGroup; } } diff --git a/EssentialsGroupManager/src/plugin.yml b/EssentialsGroupManager/src/plugin.yml index 115e92ba2..da5164ce1 100644 --- a/EssentialsGroupManager/src/plugin.yml +++ b/EssentialsGroupManager/src/plugin.yml @@ -1,5 +1,5 @@ name: GroupManager -version: "1.7 (Phoenix)" +version: "1.8 (Phoenix)" main: org.anjocaido.groupmanager.GroupManager website: http://www.anjocaido.info/ description: Provides on-the-fly system for permissions system created by Nijikokun. But all in memory, and with flat-file saving schedule. |