diff options
author | KHobbits <rob@khobbits.co.uk> | 2011-10-04 09:43:34 +0100 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2011-10-04 09:43:34 +0100 |
commit | df0d773b24374e51b8b08a8d00fb526e6de8e1af (patch) | |
tree | b1b2888c91214118e425b723d8850e16d44eee68 /EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java | |
parent | f74abc4af4366028061a2e63dfdc0c305db3a1e7 (diff) | |
parent | 7058c3101406d4f43ecf3b203aee3b8d5ffd99a6 (diff) | |
download | Essentials-df0d773b24374e51b8b08a8d00fb526e6de8e1af.tar Essentials-df0d773b24374e51b8b08a8d00fb526e6de8e1af.tar.gz Essentials-df0d773b24374e51b8b08a8d00fb526e6de8e1af.tar.lz Essentials-df0d773b24374e51b8b08a8d00fb526e6de8e1af.tar.xz Essentials-df0d773b24374e51b8b08a8d00fb526e6de8e1af.zip |
Merge branch 'essmaster' into groupmanager
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java')
-rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java index a13406eab..0fe8a15d4 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java @@ -365,15 +365,7 @@ public class GroupManager extends JavaPlugin { sender.sendMessage(ChatColor.RED + "Can't modify player involving a group that you don't inherit."); return false; } - if (!isConsole && !isOpOverride && (!permissionHandler.hasGroupInInheritance(auxUser.getGroup(), auxGroup.getName()) && !permissionHandler.hasGroupInInheritance(auxGroup, auxUser.getGroupName()))) { - sender.sendMessage(ChatColor.RED + "Can't modify player using groups with different heritage line."); - return false; - } - if (!isConsole && !isOpOverride && (!permissionHandler.hasGroupInInheritance(auxGroup, auxUser.getGroupName()))) { - sender.sendMessage(ChatColor.RED + "The new group must be a higher rank."); - return false; - } - + //PARECE OK auxUser.setGroup(auxGroup); sender.sendMessage(ChatColor.YELLOW + "You changed player '" + auxUser.getName() + "' group to '" + auxGroup.getName() + "'."); |