diff options
| author | snowleo <schneeleo@gmail.com> | 2012-04-05 17:05:43 +0200 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2012-04-05 17:05:43 +0200 |
| commit | f73a5d0e8d370c1273685533b44ce526d9d8cdef (patch) | |
| tree | 64f106d2442f8b84a8ff14b5fdf056a581d2dc24 /EssentialsGroupManager/src/org/anjocaido/groupmanager/GroupManager.java | |
| parent | aa437030945a59a0cbfe7d940f36135e40072b30 (diff) | |
| parent | f7bc04bc347c088d35ee5a939c026f28b2ce0c19 (diff) | |
| download | Essentials-f73a5d0e8d370c1273685533b44ce526d9d8cdef.tar Essentials-f73a5d0e8d370c1273685533b44ce526d9d8cdef.tar.gz Essentials-f73a5d0e8d370c1273685533b44ce526d9d8cdef.tar.lz Essentials-f73a5d0e8d370c1273685533b44ce526d9d8cdef.tar.xz Essentials-f73a5d0e8d370c1273685533b44ce526d9d8cdef.zip | |
Merge remote-tracking branch 'origin/groupmanager'
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())) { |