From 6ea835e96feba8eeca929b72510b2be6be02302a Mon Sep 17 00:00:00 2001 From: Necrodoom Date: Fri, 14 Jun 2013 10:25:41 +0300 Subject: [PATCH] change ' strip checks --- .../anjocaido/groupmanager/GroupManager.java | 41 ++++--------------- 1 file changed, 8 insertions(+), 33 deletions(-) diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java index d354b05e7..4746ac548 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java @@ -738,11 +738,7 @@ public class GroupManager extends JavaPlugin { for (int i = 1; i < args.length; i++) { - auxString = args[i]; - if (auxString.startsWith("'") && auxString.endsWith("'")) - { - auxString = auxString.substring(1, auxString.length() - 1); - } + auxString = args[i].replace("'", ""); permissionResult = permissionHandler.checkFullUserPermission(senderUser, auxString); if (!isConsole && !isOpOverride && (permissionResult.resultType.equals(PermissionCheckResult.Type.NOTFOUND) || permissionResult.resultType.equals(PermissionCheckResult.Type.NEGATION))) { @@ -791,11 +787,7 @@ public class GroupManager extends JavaPlugin { for (int i = 1; i < args.length; i++) { - auxString = args[i]; - if (auxString.startsWith("'") && auxString.endsWith("'")) - { - auxString = auxString.substring(1, auxString.length() - 1); - } + auxString = args[i].replace("'", ""); if (!isConsole && !isOpOverride && (senderGroup != null ? permissionHandler.inGroup(auxUser.getName(), senderGroup.getName()) : false)) { sender.sendMessage(ChatColor.RED + "You can't modify a player with same group as you, or higher."); @@ -950,11 +942,7 @@ public class GroupManager extends JavaPlugin { return true; } - auxString = args[1]; - if (auxString.startsWith("'") && auxString.endsWith("'")) - { - auxString = auxString.substring(1, auxString.length() - 1); - } + auxString = args[1].replace("'", ""); if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) { return false; @@ -1019,11 +1007,7 @@ public class GroupManager extends JavaPlugin { for (int i = 1; i < args.length; i++) { - auxString = args[i]; - if (auxString.startsWith("'") && auxString.endsWith("'")) - { - auxString = auxString.substring(1, auxString.length() - 1); - } + auxString = args[i].replace("'", ""); // Validating your permissions permissionResult = permissionHandler.checkFullUserPermission(senderUser, auxString); @@ -1065,11 +1049,7 @@ public class GroupManager extends JavaPlugin { } for (int i = 1; i < args.length; i++) { - auxString = args[i]; - if (auxString.startsWith("'") && auxString.endsWith("'")) - { - auxString = auxString.substring(1, auxString.length() - 1); - } + auxString = args[i].replace("'", ""); // Validating your permissions permissionResult = permissionHandler.checkFullUserPermission(senderUser, auxString); @@ -1333,10 +1313,7 @@ public class GroupManager extends JavaPlugin { auxString += " "; } } - if (auxString.startsWith("'") && auxString.endsWith("'")) - { - auxString = auxString.substring(1, auxString.length() - 1); - } + auxString = auxString.replace("'", ""); auxUser.getVariables().addVar(args[1], Variables.parseVariableValue(auxString)); sender.sendMessage(ChatColor.YELLOW + "Variable " + ChatColor.GOLD + args[1] + ChatColor.YELLOW + ":'" + ChatColor.GREEN + auxString + ChatColor.YELLOW + "' added to the user " + auxUser.getName()); @@ -1485,10 +1462,8 @@ public class GroupManager extends JavaPlugin { auxString += " "; } } - if (auxString.startsWith("'") && auxString.endsWith("'")) - { - auxString = auxString.substring(1, auxString.length() - 1); - } + + auxString = auxString.replace("'", ""); auxGroup.getVariables().addVar(args[1], Variables.parseVariableValue(auxString)); sender.sendMessage(ChatColor.YELLOW + "Variable " + ChatColor.GOLD + args[1] + ChatColor.YELLOW + ":'" + ChatColor.GREEN + auxString + ChatColor.YELLOW + "' added to the group " + auxGroup.getName());