diff options
| author | Necrodoom <doomed.war@gmail.com> | 2013-03-10 14:42:03 +0200 |
|---|---|---|
| committer | Necrodoom <doomed.war@gmail.com> | 2013-03-10 14:42:03 +0200 |
| commit | 36304c1ed0e1b259ada8911f2c50d8d49ec5c5c7 (patch) | |
| tree | 2e75b05063c009a090a5228fdd69d99efc04c549 | |
| parent | c6380f8009c2b15ffb6c2f524151d6d47a8f9831 (diff) | |
| download | Essentials-36304c1ed0e1b259ada8911f2c50d8d49ec5c5c7.tar Essentials-36304c1ed0e1b259ada8911f2c50d8d49ec5c5c7.tar.gz Essentials-36304c1ed0e1b259ada8911f2c50d8d49ec5c5c7.tar.lz Essentials-36304c1ed0e1b259ada8911f2c50d8d49ec5c5c7.tar.xz Essentials-36304c1ed0e1b259ada8911f2c50d8d49ec5c5c7.zip | |
readd some checks
| -rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java index 965203100..e27389d7a 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java @@ -1941,11 +1941,11 @@ public class GroupManager extends JavaPlugin { sender.sendMessage(ChatColor.RED + "You can't modify a player with same permissions as you, or higher."); return true; } - if (permissionHandler.hasGroupInInheritance(auxGroup, senderGroup.getName())) { + if (!isConsole && !isOpOverride && (permissionHandler.hasGroupInInheritance(auxGroup, senderGroup.getName()))) { sender.sendMessage(ChatColor.RED + "The destination group can't be the same as yours, or higher."); return true; } - if (!permissionHandler.inGroup(senderUser.getName(), auxUser.getGroupName()) || !permissionHandler.inGroup(senderUser.getName(), auxGroup.getName())) { + if (!isConsole && !isOpOverride && (!permissionHandler.inGroup(senderUser.getName(), auxUser.getGroupName()) || !permissionHandler.inGroup(senderUser.getName(), auxGroup.getName()))) { sender.sendMessage(ChatColor.RED + "You can't modify a player involving a group that you don't inherit."); return true; } @@ -1997,11 +1997,11 @@ public class GroupManager extends JavaPlugin { sender.sendMessage(ChatColor.RED + "You can't modify a player with same permissions as you, or higher."); return true; } - if (permissionHandler.hasGroupInInheritance(auxGroup, senderGroup.getName())) { + if (!isConsole && !isOpOverride && (permissionHandler.hasGroupInInheritance(auxGroup, senderGroup.getName()))) { sender.sendMessage(ChatColor.RED + "The destination group can't be the same as yours, or higher."); return true; } - if (!permissionHandler.inGroup(senderUser.getName(), auxUser.getGroupName()) || !permissionHandler.inGroup(senderUser.getName(), auxGroup.getName())) { + if (!isConsole && !isOpOverride && (!permissionHandler.inGroup(senderUser.getName(), auxUser.getGroupName()) || !permissionHandler.inGroup(senderUser.getName(), auxGroup.getName()))) { sender.sendMessage(ChatColor.RED + "You can't modify a player involving a group that you don't inherit."); return true; } |