diff options
author | snowleo <schneeleo@gmail.com> | 2012-08-03 10:36:50 +0200 |
---|---|---|
committer | snowleo <schneeleo@gmail.com> | 2012-08-03 10:36:50 +0200 |
commit | b40d663c7e9a243895f96318ac58ff06272795b3 (patch) | |
tree | f8003abedcb15dde6582b26436d0e364320ab327 | |
parent | 6513842d28d03782b23159baafa39cc5dd70f527 (diff) | |
download | Essentials-b40d663c7e9a243895f96318ac58ff06272795b3.tar Essentials-b40d663c7e9a243895f96318ac58ff06272795b3.tar.gz Essentials-b40d663c7e9a243895f96318ac58ff06272795b3.tar.lz Essentials-b40d663c7e9a243895f96318ac58ff06272795b3.tar.xz Essentials-b40d663c7e9a243895f96318ac58ff06272795b3.zip |
Ignore case on gamemode signs and code cleanup
-rw-r--r-- | Essentials/src/com/earth2me/essentials/signs/SignGameMode.java | 35 |
1 files changed, 17 insertions, 18 deletions
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignGameMode.java b/Essentials/src/com/earth2me/essentials/signs/SignGameMode.java index 636faf469..8576af975 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignGameMode.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignGameMode.java @@ -29,34 +29,33 @@ public class SignGameMode extends EssentialsSign { final Trade charge = getTrade(sign, 1, ess); final String mode = sign.getLine(2).trim(); - - if(mode.isEmpty()) + + if (mode.isEmpty()) { throw new SignException(_("invalidSignLine", 3)); } - + charge.isAffordableFor(player); - performSetMode(mode, player); + performSetMode(mode.toLowerCase(Locale.ENGLISH), player); player.sendMessage(_("gameMode", _(player.getGameMode().toString().toLowerCase(Locale.ENGLISH)), player.getDisplayName())); charge.charge(player); return true; } - + private void performSetMode(String mode, Player player) { - if (mode.contains("survi") || mode.equalsIgnoreCase("0")) - { - player.setGameMode(GameMode.SURVIVAL); - } - else if (mode.contains("creat") || mode.equalsIgnoreCase("1")) - { - player.setGameMode(GameMode.CREATIVE); - } - else if (mode.contains("advent") || mode.equalsIgnoreCase("2")) - { - player.setGameMode(GameMode.ADVENTURE); - } + if (mode.contains("survi") || mode.equalsIgnoreCase("0")) + { + player.setGameMode(GameMode.SURVIVAL); + } + else if (mode.contains("creat") || mode.equalsIgnoreCase("1")) + { + player.setGameMode(GameMode.CREATIVE); + } + else if (mode.contains("advent") || mode.equalsIgnoreCase("2")) + { + player.setGameMode(GameMode.ADVENTURE); + } } - } |