Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-08 03:50:06 +01:00
Code Issues Projects Releases Wiki Activity

Fix recursive loop when used on offline servers.

Browse Source
This commit is contained in:
ElgarL 2013-01-14 06:47:50 +00:00
parent 4533d09fc9
commit 04c833f648
1 changed files with 33 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -768,6 +768,9 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
}
/**
* Wrapper for offline server checks.
* Looks for the 'groupmanager.noofflineperms' permissions and reports no permissions on servers set to offline.
*
* Check user and groups with inheritance and Bukkit if bukkit = true return
* a PermissionCheckResult.
*
@ -778,23 +781,42 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
*/
public PermissionCheckResult checkFullGMPermission(User user, String targetPermission, Boolean checkBukkit) {
PermissionCheckResult result = new PermissionCheckResult();
result.accessLevel = targetPermission;
result.resultType = PermissionCheckResult.Type.NOTFOUND;
if (user == null || targetPermission == null || targetPermission.isEmpty()) {
return result;
}
/*
* Do not push any perms to bukkit if...
* Report no permissions under the following conditions.
*
* We are in offline mode
* and the player has the 'groupmanager.noofflineperms' permission.
*/
if (!Bukkit.getServer().getOnlineMode()
&& (checkFullGMPermission(user, "groupmanager.noofflineperms", true).resultType == PermissionCheckResult.Type.FOUND))
if (user == null || targetPermission == null || targetPermission.isEmpty() ||
(!Bukkit.getServer().getOnlineMode()
&& (checkPermission(user, "groupmanager.noofflineperms", true).resultType == PermissionCheckResult.Type.FOUND))) {
PermissionCheckResult result = new PermissionCheckResult();
result.accessLevel = targetPermission;
result.resultType = PermissionCheckResult.Type.NOTFOUND;
return result;
}
return checkPermission(user, targetPermission, checkBukkit);
}
/**
*
* Check user and groups with inheritance and Bukkit if bukkit = true return
* a PermissionCheckResult.
*
* @param user
* @param targetPermission
* @param checkBukkit
* @return PermissionCheckResult
*/
private PermissionCheckResult checkPermission(User user, String targetPermission, Boolean checkBukkit) {
PermissionCheckResult result = new PermissionCheckResult();
result.accessLevel = targetPermission;
result.resultType = PermissionCheckResult.Type.NOTFOUND;
if (checkBukkit) {
// Check Bukkit perms to support plugins which add perms via code
// (Heroes).