diff options
author | KHobbits <rob@khobbits.co.uk> | 2012-10-02 21:06:28 +0100 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2012-10-02 21:06:28 +0100 |
commit | 26bcb84ee328fdf2eb30392451956a802deba229 (patch) | |
tree | 343f3c11aae189ec66f640adc89e87e01f9073d9 | |
parent | 9a6616b302eaf37e1adbafa037956f0b9b276576 (diff) | |
download | Essentials-26bcb84ee328fdf2eb30392451956a802deba229.tar Essentials-26bcb84ee328fdf2eb30392451956a802deba229.tar.gz Essentials-26bcb84ee328fdf2eb30392451956a802deba229.tar.lz Essentials-26bcb84ee328fdf2eb30392451956a802deba229.tar.xz Essentials-26bcb84ee328fdf2eb30392451956a802deba229.zip |
Fix gamemode other perm check
-rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java b/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java index 85aeaa673..9f38eb5ae 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandgamemode.java @@ -41,18 +41,25 @@ public class Commandgamemode extends EssentialsCommand gamemodeOtherPlayers(server, user, gameMode, args[1]); return; } - else + else { - try { + try + { gameMode = matchGameMode(args[0].toLowerCase(Locale.ENGLISH)); } - catch (NotEnoughArgumentsException e) { - gameMode = matchGameMode(commandLabel); - gamemodeOtherPlayers(server, user, gameMode, args[0]); - return; + catch (NotEnoughArgumentsException e) + { + if (user.isAuthorized("essentials.gamemode.others")) + { + gameMode = matchGameMode(commandLabel); + gamemodeOtherPlayers(server, user, gameMode, args[0]); + return; + } + throw new NotEnoughArgumentsException(); } } - if (gameMode == null) { + if (gameMode == null) + { gameMode = user.getGameMode() == GameMode.SURVIVAL ? GameMode.CREATIVE : user.getGameMode() == GameMode.CREATIVE ? GameMode.ADVENTURE : GameMode.SURVIVAL; } user.setGameMode(gameMode); @@ -104,11 +111,12 @@ public class Commandgamemode extends EssentialsCommand mode = GameMode.ADVENTURE; } else if (modeString.equalsIgnoreCase("gmt") || modeString.equalsIgnoreCase("egmt") - || modeString.contains("toggle") || modeString.contains("cycle") || modeString.equalsIgnoreCase("t")) + || modeString.contains("toggle") || modeString.contains("cycle") || modeString.equalsIgnoreCase("t")) { mode = null; } - else { + else + { throw new NotEnoughArgumentsException(); } return mode; |