diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-04-05 23:37:33 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-04-05 23:37:33 +0100 |
| commit | 6a75d6fe86c78d2f5b5b3716291b7b81171b330e (patch) | |
| tree | 33d31861f9854348d54225405aa282d617080dab /EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java | |
| parent | bc876611d0df5be116c280996add50725083142c (diff) | |
| parent | 798ea777365d13a8970e4c55c2fafefefd1e166a (diff) | |
| download | Essentials-6a75d6fe86c78d2f5b5b3716291b7b81171b330e.tar Essentials-6a75d6fe86c78d2f5b5b3716291b7b81171b330e.tar.gz Essentials-6a75d6fe86c78d2f5b5b3716291b7b81171b330e.tar.lz Essentials-6a75d6fe86c78d2f5b5b3716291b7b81171b330e.tar.xz Essentials-6a75d6fe86c78d2f5b5b3716291b7b81171b330e.zip | |
Merge branch 'master' of github.com:essentials/Essentials
Diffstat (limited to 'EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java')
| -rw-r--r-- | EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java index 09ea3b247..8bd346735 100644 --- a/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java +++ b/EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java @@ -303,7 +303,7 @@ public class GroupManager extends JavaPlugin { senderPlayer = (Player) sender; senderUser = worldsHolder.getWorldData(senderPlayer).getUser(senderPlayer.getName()); senderGroup = senderUser.getGroup(); - isOpOverride = (isOpOverride && senderPlayer.isOp()); + isOpOverride = (isOpOverride && (senderPlayer.isOp() || worldsHolder.getWorldPermissions(senderPlayer).has(senderPlayer, "groupmanager.op"))); System.out.println("[PLAYER_COMMAND] " + senderPlayer.getName() + ": /" + commandLabel + " " + Tasks.join(args, " ")); if (isOpOverride || worldsHolder.getWorldPermissions(senderPlayer).has(senderPlayer, "groupmanager." + cmd.getName())) { |