Ignore case on gamemode signs and code cleanup

This commit is contained in:
snowleo 2012-08-03 10:36:50 +02:00
parent 6513842d28
commit b40d663c7e

View file

@ -30,14 +30,14 @@ public class SignGameMode extends EssentialsSign
final Trade charge = getTrade(sign, 1, ess); final Trade charge = getTrade(sign, 1, ess);
final String mode = sign.getLine(2).trim(); final String mode = sign.getLine(2).trim();
if(mode.isEmpty()) if (mode.isEmpty())
{ {
throw new SignException(_("invalidSignLine", 3)); throw new SignException(_("invalidSignLine", 3));
} }
charge.isAffordableFor(player); charge.isAffordableFor(player);
performSetMode(mode, player); performSetMode(mode.toLowerCase(Locale.ENGLISH), player);
player.sendMessage(_("gameMode", _(player.getGameMode().toString().toLowerCase(Locale.ENGLISH)), player.getDisplayName())); player.sendMessage(_("gameMode", _(player.getGameMode().toString().toLowerCase(Locale.ENGLISH)), player.getDisplayName()));
charge.charge(player); charge.charge(player);
return true; return true;
@ -45,18 +45,17 @@ public class SignGameMode extends EssentialsSign
private void performSetMode(String mode, Player player) private void performSetMode(String mode, Player player)
{ {
if (mode.contains("survi") || mode.equalsIgnoreCase("0")) if (mode.contains("survi") || mode.equalsIgnoreCase("0"))
{ {
player.setGameMode(GameMode.SURVIVAL); player.setGameMode(GameMode.SURVIVAL);
} }
else if (mode.contains("creat") || mode.equalsIgnoreCase("1")) else if (mode.contains("creat") || mode.equalsIgnoreCase("1"))
{ {
player.setGameMode(GameMode.CREATIVE); player.setGameMode(GameMode.CREATIVE);
} }
else if (mode.contains("advent") || mode.equalsIgnoreCase("2")) else if (mode.contains("advent") || mode.equalsIgnoreCase("2"))
{ {
player.setGameMode(GameMode.ADVENTURE); player.setGameMode(GameMode.ADVENTURE);
} }
} }
} }