mirror of
https://github.com/essentials/Essentials.git
synced 2025-02-24 00:13:48 +01:00
if variable is inside ' ', strip them
This commit is contained in:
parent
f02ebf245f
commit
32415d2801
@ -719,6 +719,11 @@ public class GroupManager extends JavaPlugin {
|
||||
sender.sendMessage(ChatColor.RED + "Review your arguments count! (/<command> <player> <permission>)");
|
||||
return false;
|
||||
}
|
||||
String auxString = args[1];
|
||||
if (auxString.startsWith("'") && auxString.endsWith("'"))
|
||||
{
|
||||
auxString = auxString.substring(1, auxString.length() - 1)
|
||||
}
|
||||
if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
|
||||
return false;
|
||||
}
|
||||
@ -740,13 +745,13 @@ public class GroupManager extends JavaPlugin {
|
||||
}
|
||||
// Validating permissions of user
|
||||
permissionResult = permissionHandler.checkUserOnlyPermission(auxUser, args[1]);
|
||||
if (args[1].startsWith("+")) {
|
||||
if (auxString.startsWith("+")) {
|
||||
if (permissionResult.resultType.equals(PermissionCheckResult.Type.EXCEPTION)) {
|
||||
sender.sendMessage(ChatColor.RED + "The user already has direct access to that permission.");
|
||||
sender.sendMessage(ChatColor.RED + "Node: " + permissionResult.accessLevel);
|
||||
return false;
|
||||
}
|
||||
} else if (args[1].startsWith("-")) {
|
||||
} else if (auxString.startsWith("-")) {
|
||||
if (permissionResult.resultType.equals(PermissionCheckResult.Type.EXCEPTION)) {
|
||||
sender.sendMessage(ChatColor.RED + "The user already has an exception for this node.");
|
||||
sender.sendMessage(ChatColor.RED + "Node: " + permissionResult.accessLevel);
|
||||
@ -764,8 +769,8 @@ public class GroupManager extends JavaPlugin {
|
||||
}
|
||||
}
|
||||
// Seems OK
|
||||
auxUser.addPermission(args[1]);
|
||||
sender.sendMessage(ChatColor.YELLOW + "You added '" + args[1] + "' to player '" + auxUser.getName() + "' permissions.");
|
||||
auxUser.addPermission(auxString);
|
||||
sender.sendMessage(ChatColor.YELLOW + "You added '" + auxString + "' to player '" + auxUser.getName() + "' permissions.");
|
||||
|
||||
targetPlayer = this.getServer().getPlayer(auxUser.getName());
|
||||
if (targetPlayer != null)
|
||||
@ -955,6 +960,11 @@ public class GroupManager extends JavaPlugin {
|
||||
sender.sendMessage(ChatColor.RED + "Review your arguments count! (/<command> <group> <permission>)");
|
||||
return false;
|
||||
}
|
||||
String auxString = args[1];
|
||||
if (auxString.startsWith("'") && auxString.endsWith("'"))
|
||||
{
|
||||
auxString = auxString.substring(1, auxString.length() - 1)
|
||||
}
|
||||
auxGroup = dataHolder.getGroup(args[0]);
|
||||
if (auxGroup == null) {
|
||||
sender.sendMessage(ChatColor.RED + "The specified group does not exist!");
|
||||
@ -968,13 +978,13 @@ public class GroupManager extends JavaPlugin {
|
||||
}
|
||||
// Validating permissions of user
|
||||
permissionResult = permissionHandler.checkGroupOnlyPermission(auxGroup, args[1]);
|
||||
if (args[1].startsWith("+")) {
|
||||
if (auxString.startsWith("+")) {
|
||||
if (permissionResult.resultType.equals(PermissionCheckResult.Type.EXCEPTION)) {
|
||||
sender.sendMessage(ChatColor.RED + "The group already has direct access to that permission.");
|
||||
sender.sendMessage(ChatColor.RED + "Node: " + permissionResult.accessLevel);
|
||||
return false;
|
||||
}
|
||||
} else if (args[1].startsWith("-")) {
|
||||
} else if (auxString.startsWith("-")) {
|
||||
if (permissionResult.resultType.equals(PermissionCheckResult.Type.EXCEPTION)) {
|
||||
sender.sendMessage(ChatColor.RED + "The group already has an exception for this node.");
|
||||
sender.sendMessage(ChatColor.RED + "Node: " + permissionResult.accessLevel);
|
||||
@ -992,8 +1002,8 @@ public class GroupManager extends JavaPlugin {
|
||||
}
|
||||
}
|
||||
// Seems OK
|
||||
auxGroup.addPermission(args[1]);
|
||||
sender.sendMessage(ChatColor.YELLOW + "You added '" + args[1] + "' to group '" + auxGroup.getName() + "' permissions.");
|
||||
auxGroup.addPermission(auxString);
|
||||
sender.sendMessage(ChatColor.YELLOW + "You added '" + auxString + "' to group '" + auxGroup.getName() + "' permissions.");
|
||||
|
||||
BukkitPermissions.updateAllPlayers();
|
||||
|
||||
@ -1235,6 +1245,10 @@ public class GroupManager extends JavaPlugin {
|
||||
auxString += " ";
|
||||
}
|
||||
}
|
||||
if (auxString.startsWith("'") && auxString.endsWith("'"))
|
||||
{
|
||||
auxString = auxString.substring(1, auxString.length() - 1)
|
||||
}
|
||||
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());
|
||||
|
||||
@ -1383,6 +1397,10 @@ public class GroupManager extends JavaPlugin {
|
||||
auxString += " ";
|
||||
}
|
||||
}
|
||||
if (auxString.startsWith("'") && auxString.endsWith("'"))
|
||||
{
|
||||
auxString = auxString.substring(1, auxString.length() - 1)
|
||||
}
|
||||
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());
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user