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

Improve Javadocs, clean ' strip checks, update changelog.

Browse Source
This commit is contained in:
Necrodoom 2013-06-14 10:00:43 +03:00 committed by KHobbits
parent 862e71bc85
commit 67be18566c
3 changed files with 16 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
EssentialsGroupManager/src/Changelog.txt
View File

@ -221,3 +221,4 @@ v 2.0:
- Only prevent adding nodes with '/manuaddp' and '/mangaddp' if they are exact matches (not wildcards). - Only prevent adding nodes with '/manuaddp' and '/mangaddp' if they are exact matches (not wildcards).
- Store worldSelection indexed on the senders name rather than the object (fixes commandblocks using manselect). - Store worldSelection indexed on the senders name rather than the object (fixes commandblocks using manselect).
- Check subgroup permissions with an equal priority so no one subgroup is higher ranked than another. - Check subgroup permissions with an equal priority so no one subgroup is higher ranked than another.
- add recursive permission adding/deleting

45
EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java
View File

@ -738,11 +738,7 @@ public class GroupManager extends JavaPlugin {
for (int i = 1; i < args.length; i++) for (int i = 1; i < args.length; i++)
{ {
auxString = args[i]; auxString = args[i].replace("'", "");
if (auxString.startsWith("'") && auxString.endsWith("'"))
{
auxString = auxString.substring(1, auxString.length() - 1);
}
permissionResult = permissionHandler.checkFullUserPermission(senderUser, auxString); permissionResult = permissionHandler.checkFullUserPermission(senderUser, auxString);
if (!isConsole && !isOpOverride && (permissionResult.resultType.equals(PermissionCheckResult.Type.NOTFOUND) || permissionResult.resultType.equals(PermissionCheckResult.Type.NEGATION))) { 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++) for (int i = 1; i < args.length; i++)
{ {
auxString = args[i]; auxString = args[i].replace("'", "");
if (auxString.startsWith("'") && auxString.endsWith("'"))
{
auxString = auxString.substring(1, auxString.length() - 1);
}
if (!isConsole && !isOpOverride && (senderGroup != null ? permissionHandler.inGroup(auxUser.getName(), senderGroup.getName()) : false)) { 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."); 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; return true;
} }
auxString = args[1]; auxString = args[1].replace("'", "");
if (auxString.startsWith("'") && auxString.endsWith("'"))
{
auxString = auxString.substring(1, auxString.length() - 1);
}
if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) { if ((validateOnlinePlayer) && ((match = validatePlayer(args[0], sender)) == null)) {
return false; return false;
@ -1019,11 +1007,7 @@ public class GroupManager extends JavaPlugin {
for (int i = 1; i < args.length; i++) for (int i = 1; i < args.length; i++)
{ {
auxString = args[i]; auxString = args[i].replace("'", "");
if (auxString.startsWith("'") && auxString.endsWith("'"))
{
auxString = auxString.substring(1, auxString.length() - 1);
}
// Validating your permissions // Validating your permissions
permissionResult = permissionHandler.checkFullUserPermission(senderUser, auxString); permissionResult = permissionHandler.checkFullUserPermission(senderUser, auxString);
@ -1065,11 +1049,7 @@ public class GroupManager extends JavaPlugin {
} }
for (int i = 1; i < args.length; i++) for (int i = 1; i < args.length; i++)
{ {
auxString = args[i]; auxString = args[i].replace("'", "");
if (auxString.startsWith("'") && auxString.endsWith("'"))
{
auxString = auxString.substring(1, auxString.length() - 1);
}
// Validating your permissions // Validating your permissions
permissionResult = permissionHandler.checkFullUserPermission(senderUser, auxString); permissionResult = permissionHandler.checkFullUserPermission(senderUser, auxString);
@ -1333,10 +1313,7 @@ public class GroupManager extends JavaPlugin {
auxString += " "; auxString += " ";
} }
} }
if (auxString.startsWith("'") && auxString.endsWith("'")) auxString = auxString.replace("'", "");
{
auxString = auxString.substring(1, auxString.length() - 1);
}
auxUser.getVariables().addVar(args[1], Variables.parseVariableValue(auxString)); 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()); 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 += " "; auxString += " ";
} }
} }
if (auxString.startsWith("'") && auxString.endsWith("'"))
{ auxString = auxString.replace("'", "");
auxString = auxString.substring(1, auxString.length() - 1);
}
auxGroup.getVariables().addVar(args[1], Variables.parseVariableValue(auxString)); 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()); sender.sendMessage(ChatColor.YELLOW + "Variable " + ChatColor.GOLD + args[1] + ChatColor.YELLOW + ":'" + ChatColor.GREEN + auxString + ChatColor.YELLOW + "' added to the group " + auxGroup.getName());
@ -2097,7 +2072,7 @@ public class GroupManager extends JavaPlugin {
} }
/** /**
* Checks if a permission exists and of a lower priority. * Checks if a permission exists and of a lower or same priority.
*/ */
private boolean checkPermissionExists(CommandSender sender, String newPerm, PermissionCheckResult oldPerm, String type) { private boolean checkPermissionExists(CommandSender sender, String newPerm, PermissionCheckResult oldPerm, String type) {
@ -2132,13 +2107,11 @@ public class GroupManager extends JavaPlugin {
{ {
sender.sendMessage(ChatColor.RED + "The " + type + " already has an exception for this node."); sender.sendMessage(ChatColor.RED + "The " + type + " already has an exception for this node.");
sender.sendMessage(ChatColor.RED + "Node: " + oldPerm.accessLevel); sender.sendMessage(ChatColor.RED + "Node: " + oldPerm.accessLevel);
return true;
} }
else if (oldPerm.resultType.equals(PermissionCheckResult.Type.NEGATION)) else if (oldPerm.resultType.equals(PermissionCheckResult.Type.NEGATION))
{ {
sender.sendMessage(ChatColor.RED + "The " + type + " already has a matching negated node."); sender.sendMessage(ChatColor.RED + "The " + type + " already has a matching negated node.");
sender.sendMessage(ChatColor.RED + "Node: " + oldPerm.accessLevel); sender.sendMessage(ChatColor.RED + "Node: " + oldPerm.accessLevel);
return true;
} }
else if (oldPerm.resultType.equals(PermissionCheckResult.Type.FOUND)) else if (oldPerm.resultType.equals(PermissionCheckResult.Type.FOUND))
{ {

8
EssentialsGroupManager/src/plugin.yml
View File

@ -34,11 +34,11 @@ commands:
permissions: groupmanager.mangdel permissions: groupmanager.mangdel
manuaddp: manuaddp:
description: Add permissions directly to the player. description: Add permissions directly to the player.
usage: /<command> <player> <permissions> usage: /<command> <player> <permission> [permission2] [permission3]..
permissions: groupmanager.manuaddp permissions: groupmanager.manuaddp
manudelp: manudelp:
description: Removes permissions directly from the player. description: Removes permissions directly from the player.
usage: /<command> <player> <permissions> usage: /<command> <player> <permission> [permission2] [permission3]..
permissions: groupmanager.manudelp permissions: groupmanager.manudelp
manuclearp: manuclearp:
description: Removes all permissions of a player. description: Removes all permissions of a player.
@ -54,11 +54,11 @@ commands:
permissions: groupmanager.manucheckp permissions: groupmanager.manucheckp
mangaddp: mangaddp:
description: Add permissions to a group. description: Add permissions to a group.
usage: /<command> <group> <permissions> usage: /<command> <group> <permission> [permission2] [permission3]..
permissions: groupmanager.mangaddp permissions: groupmanager.mangaddp
mangdelp: mangdelp:
description: Removes permissions from a group. description: Removes permissions from a group.
usage: /<command> <group> <permissions> usage: /<command> <group> <permission> [permission2] [permission3]..
permissions: groupmanager.mangdelp permissions: groupmanager.mangdelp
mangclearp: mangclearp:
description: Removes all permissions of a group. description: Removes all permissions of a group.