diff options
author | KHobbits <rob@khobbits.co.uk> | 2012-08-06 00:23:47 +0100 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2012-08-06 00:23:47 +0100 |
commit | 3dbabfa11d52a7565ceaf9da264643bce6cd1eeb (patch) | |
tree | 3d478148469610b279869d913fa8d6296508915e | |
parent | 7a96fd1dce46c7149dd46e78c87ccd6049a0adc4 (diff) | |
download | Essentials-3dbabfa11d52a7565ceaf9da264643bce6cd1eeb.tar Essentials-3dbabfa11d52a7565ceaf9da264643bce6cd1eeb.tar.gz Essentials-3dbabfa11d52a7565ceaf9da264643bce6cd1eeb.tar.lz Essentials-3dbabfa11d52a7565ceaf9da264643bce6cd1eeb.tar.xz Essentials-3dbabfa11d52a7565ceaf9da264643bce6cd1eeb.zip |
Default value for [gamemode] sign
New syntax: [gamemode] / <mode> / [price]
-rw-r--r-- | Essentials/src/com/earth2me/essentials/signs/SignGameMode.java | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignGameMode.java b/Essentials/src/com/earth2me/essentials/signs/SignGameMode.java index 8576af975..2f39a8a22 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignGameMode.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignGameMode.java @@ -19,20 +19,27 @@ public class SignGameMode extends EssentialsSign @Override protected boolean onSignCreate(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException - { - validateTrade(sign, 1, ess); + { + final String gamemode = sign.getLine(1); + if (gamemode.isEmpty()) + { + sign.setLine(1, "Survival"); + } + + validateTrade(sign, 2, ess); + return true; } @Override protected boolean onSignInteract(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException { - final Trade charge = getTrade(sign, 1, ess); - final String mode = sign.getLine(2).trim(); + final Trade charge = getTrade(sign, 2, ess); + final String mode = sign.getLine(1).trim(); if (mode.isEmpty()) { - throw new SignException(_("invalidSignLine", 3)); + throw new SignException(_("invalidSignLine", 2)); } charge.isAffordableFor(player); @@ -43,7 +50,7 @@ public class SignGameMode extends EssentialsSign return true; } - private void performSetMode(String mode, Player player) + private void performSetMode(String mode, Player player) throws SignException { if (mode.contains("survi") || mode.equalsIgnoreCase("0")) { @@ -57,5 +64,8 @@ public class SignGameMode extends EssentialsSign { player.setGameMode(GameMode.ADVENTURE); } + else { + throw new SignException(_("invalidSignLine", 2)); + } } } |