From aa58ebc63e3f1053ed0e756f230b26cae7bcd163 Mon Sep 17 00:00:00 2001 From: ElgarL Date: Mon, 25 Feb 2013 10:27:01 +0000 Subject: Don't allow adding a node with '/manuaddp' and '/mangaddp' which is already negated. --- EssentialsGroupManager/src/Changelog.txt | 3 ++- .../src/org/anjocaido/groupmanager/GroupManager.java | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) (limited to 'EssentialsGroupManager') diff --git a/EssentialsGroupManager/src/Changelog.txt b/EssentialsGroupManager/src/Changelog.txt index 4e5225bc2..6226484d7 100644 --- a/EssentialsGroupManager/src/Changelog.txt +++ b/EssentialsGroupManager/src/Changelog.txt @@ -215,4 +215,5 @@ v 2.0: - Add config potion to set if GM commands should be allowed on CommnandBlocks. - Catch the error when using an out of date config for 'allow_commandblocks' So it doesn't kill the whole config. - '/manselect' will no longer list duplicate worlds. - - Added a new mirroring option in the config of 'all_unnamed_worlds'. This will cause all new or unnamed worlds to use this mirroring. \ No newline at end of file + - Added a new mirroring option in the config of 'all_unnamed_worlds'. This will cause all new or unnamed worlds to use this mirroring. + - Don't allow adding a node with '/manuaddp' and '/mangaddp' which is already negated. \ No newline at end of file diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java index fb39d28ee..bf9e49300 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java @@ -767,6 +767,10 @@ public class GroupManager extends JavaPlugin { sender.sendMessage(ChatColor.RED + "The user already has direct access to that permission."); sender.sendMessage(ChatColor.RED + "Node: " + permissionResult.accessLevel); return true; + } else if (permissionResult.resultType.equals(PermissionCheckResult.Type.NEGATION)) { + sender.sendMessage(ChatColor.RED + "The user already has a matching Negated node "); + sender.sendMessage(ChatColor.RED + "Node: " + permissionResult.accessLevel); + return true; } } // Seems OK @@ -1015,6 +1019,10 @@ public class GroupManager extends JavaPlugin { sender.sendMessage(ChatColor.RED + "The group already has direct access to that permission."); sender.sendMessage(ChatColor.RED + "Node: " + permissionResult.accessLevel); return true; + } else if (permissionResult.resultType.equals(PermissionCheckResult.Type.NEGATION)) { + sender.sendMessage(ChatColor.RED + "The group already has a matching Negated node "); + sender.sendMessage(ChatColor.RED + "Node: " + permissionResult.accessLevel); + return true; } } // Seems OK -- cgit v1.2.3