diff options
| author | ElgarL <ElgarL@palmergames.com> | 2012-12-31 07:59:27 -0800 |
|---|---|---|
| committer | ElgarL <ElgarL@palmergames.com> | 2012-12-31 07:59:27 -0800 |
| commit | f0d8aec4380db7cb87b058a588c610858acc3691 (patch) | |
| tree | 9ed6e0bf7348333ab99c5ff06938fc9f81335d3f /EssentialsGroupManager/src/org/anjocaido | |
| parent | aa5bdd5b16b907a71002f9f33d7a2f48be2cc1da (diff) | |
| parent | 0490a1e4999ca1485eb7981502949ae10e100d9d (diff) | |
| download | Essentials-f0d8aec4380db7cb87b058a588c610858acc3691.tar Essentials-f0d8aec4380db7cb87b058a588c610858acc3691.tar.gz Essentials-f0d8aec4380db7cb87b058a588c610858acc3691.tar.lz Essentials-f0d8aec4380db7cb87b058a588c610858acc3691.tar.xz Essentials-f0d8aec4380db7cb87b058a588c610858acc3691.zip | |
Merge pull request #235 from necrodoom/patch-10
fix isOpOverride checks
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido')
| -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 c6a91c66c..8c6b49ea5 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java @@ -721,7 +721,7 @@ public class GroupManager extends JavaPlugin { auxUser = dataHolder.getUser(args[0]); } // Validating your permissions - if (!isConsole && (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 + "Can't modify player with same group than you, or higher."); return false; } @@ -954,7 +954,7 @@ public class GroupManager extends JavaPlugin { } // Validating your permissions permissionResult = permissionHandler.checkFullUserPermission(senderUser, args[1]); - if (!isConsole && (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))) { sender.sendMessage(ChatColor.RED + "You can't add a permission you don't have."); return false; } @@ -1545,7 +1545,7 @@ public class GroupManager extends JavaPlugin { auxUser = dataHolder.getUser(args[0]); } // Validating permission - if (!isConsole && (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 + "Can't modify player with same permissions than you, or higher."); return false; } @@ -1579,7 +1579,7 @@ public class GroupManager extends JavaPlugin { auxUser = dataHolder.getUser(args[0]); } // Validating permission - if (!isConsole && (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 permissions as you, or higher."); return false; } |