mirror of
https://github.com/TotalFreedomMC/TF-EssentialsX.git
synced 2024-09-12 05:08:48 +00:00
Fixed 'manucheckp' returning a null for the searched node when it's a
group/subgroup.
This commit is contained in:
parent
ac77bbb0b4
commit
de40f7f556
|
@ -87,4 +87,6 @@ v 1.7:
|
||||||
- GM now registers with Bukkits ServicesManager.
|
- GM now registers with Bukkits ServicesManager.
|
||||||
- deleting the contents of GlobalGroups.yml will no longer thrown a NullPointerException.
|
- deleting the contents of GlobalGroups.yml will no longer thrown a NullPointerException.
|
||||||
- Removed op permissions from admins in the default GloblaGroups.yml.
|
- Removed op permissions from admins in the default GloblaGroups.yml.
|
||||||
|
v 1.8:
|
||||||
- Changed ServicesManager registration to lowest from normal.
|
- Changed ServicesManager registration to lowest from normal.
|
||||||
|
- Fixed 'manucheckp' returning a null for the searched node when it's a group/subgroup.
|
|
@ -711,12 +711,14 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
|
||||||
|
|
||||||
PermissionCheckResult resultUser = checkUserOnlyPermission(user, targetPermission);
|
PermissionCheckResult resultUser = checkUserOnlyPermission(user, targetPermission);
|
||||||
if (resultUser.resultType != PermissionCheckResult.Type.NOTFOUND) {
|
if (resultUser.resultType != PermissionCheckResult.Type.NOTFOUND) {
|
||||||
|
resultUser.accessLevel = targetPermission;
|
||||||
return resultUser;
|
return resultUser;
|
||||||
}
|
}
|
||||||
|
|
||||||
// IT ONLY CHECKS GROUPS PERMISSIONS IF RESULT FOR USER IS NOT FOUND
|
// IT ONLY CHECKS GROUPS PERMISSIONS IF RESULT FOR USER IS NOT FOUND
|
||||||
PermissionCheckResult resultGroup = checkGroupPermissionWithInheritance(user.getGroup(), targetPermission);
|
PermissionCheckResult resultGroup = checkGroupPermissionWithInheritance(user.getGroup(), targetPermission);
|
||||||
if (resultGroup.resultType != PermissionCheckResult.Type.NOTFOUND) {
|
if (resultGroup.resultType != PermissionCheckResult.Type.NOTFOUND) {
|
||||||
|
result.accessLevel = targetPermission;
|
||||||
return resultGroup;
|
return resultGroup;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -724,6 +726,7 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
|
||||||
for (Group subGroup : user.subGroupListCopy()) {
|
for (Group subGroup : user.subGroupListCopy()) {
|
||||||
PermissionCheckResult resultSubGroup = checkGroupPermissionWithInheritance(subGroup, targetPermission);
|
PermissionCheckResult resultSubGroup = checkGroupPermissionWithInheritance(subGroup, targetPermission);
|
||||||
if (resultSubGroup.resultType != PermissionCheckResult.Type.NOTFOUND) {
|
if (resultSubGroup.resultType != PermissionCheckResult.Type.NOTFOUND) {
|
||||||
|
resultSubGroup.accessLevel = targetPermission;
|
||||||
return resultSubGroup;
|
return resultSubGroup;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
name: GroupManager
|
name: GroupManager
|
||||||
version: "1.7 (Phoenix)"
|
version: "1.8 (Phoenix)"
|
||||||
main: org.anjocaido.groupmanager.GroupManager
|
main: org.anjocaido.groupmanager.GroupManager
|
||||||
website: http://www.anjocaido.info/
|
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.
|
description: Provides on-the-fly system for permissions system created by Nijikokun. But all in memory, and with flat-file saving schedule.
|
||||||
|
|
Loading…
Reference in a new issue