TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-05-04 04:08:06 +00:00
Code Issues Projects Releases Wiki Activity

Optimize comparePermissionString

Browse source
This commit is contained in:
ElgarL 2011-11-24 15:28:32 +00:00
parent dec7ea1926
commit 73a7a6a1dd
1 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
EssentialsGroupManager/src/org/anjocaido/groupmanager/permissions/AnjoPermissionsHandler.java
View file

@ -9,6 +9,8 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.StringTokenizer; import java.util.StringTokenizer;
import java.util.logging.Level;
import org.anjocaido.groupmanager.GroupManager; import org.anjocaido.groupmanager.GroupManager;
import org.anjocaido.groupmanager.data.Group; import org.anjocaido.groupmanager.data.Group;
import org.anjocaido.groupmanager.dataholder.WorldDataHolder; import org.anjocaido.groupmanager.dataholder.WorldDataHolder;
@ -698,7 +700,8 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
} }
// Check Bukkit perms to support plugins which add perms via code (Heroes). // Check Bukkit perms to support plugins which add perms via code (Heroes).
if ((Bukkit.getPlayer(user.getName()) != null) && (Bukkit.getPlayer(user.getName()).hasPermission(targetPermission))) { final Player player = Bukkit.getPlayer(user.getName());
if ((player != null) && (player.hasPermission(targetPermission))) {
result.resultType = PermissionCheckResult.Type.FOUND; result.resultType = PermissionCheckResult.Type.FOUND;
result.owner = user; result.owner = user;
return result; return result;
@ -967,6 +970,9 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
if (userAcessLevel == null || fullPermissionName == null) { if (userAcessLevel == null || fullPermissionName == null) {
return false; return false;
} }
boolean logFinest = (GroupManager.logger.getLevel() == Level.FINEST);
if (logFinest)
GroupManager.logger.finest("COMPARING " + userAcessLevel + " WITH " + fullPermissionName); GroupManager.logger.finest("COMPARING " + userAcessLevel + " WITH " + fullPermissionName);
if (userAcessLevel.startsWith("+")) { if (userAcessLevel.startsWith("+")) {
@ -986,24 +992,30 @@ public class AnjoPermissionsHandler extends PermissionsReaderInterface {
while (levelATokenizer.hasMoreTokens() && levelBTokenizer.hasMoreTokens()) { while (levelATokenizer.hasMoreTokens() && levelBTokenizer.hasMoreTokens()) {
String levelA = levelATokenizer.nextToken(); String levelA = levelATokenizer.nextToken();
String levelB = levelBTokenizer.nextToken(); String levelB = levelBTokenizer.nextToken();
if (logFinest)
GroupManager.logger.finest("ROUND " + levelA + " AGAINST " + levelB); GroupManager.logger.finest("ROUND " + levelA + " AGAINST " + levelB);
if (levelA.contains("*")) { if (levelA.contains("*")) {
if (logFinest)
GroupManager.logger.finest("WIN"); GroupManager.logger.finest("WIN");
return true; return true;
} }
if (levelA.equalsIgnoreCase(levelB)) { if (levelA.equalsIgnoreCase(levelB)) {
if (!levelATokenizer.hasMoreTokens() && !levelBTokenizer.hasMoreTokens()) { if (!levelATokenizer.hasMoreTokens() && !levelBTokenizer.hasMoreTokens()) {
if (logFinest)
GroupManager.logger.finest("WIN"); GroupManager.logger.finest("WIN");
return true; return true;
} }
if (logFinest)
GroupManager.logger.finest("NEXT"); GroupManager.logger.finest("NEXT");
continue; continue;
} else { } else {
if (logFinest)
GroupManager.logger.finest("FAIL"); GroupManager.logger.finest("FAIL");
return false; return false;
} }
} }
if (logFinest)
GroupManager.logger.finest("FAIL"); GroupManager.logger.finest("FAIL");
return false; return false;
} }