diff options
author | KHobbits <rob@khobbits.co.uk> | 2013-01-05 07:24:02 +0000 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2013-01-05 07:24:02 +0000 |
commit | ef7b940e96ae8ec9c7a45645cdc3b7c9bff776d8 (patch) | |
tree | 200f6ba7612a867be12cfa86c3d356a35a62a2c3 | |
parent | 6497db837d83437ce7757754dfa1a0b2d8120071 (diff) | |
download | Essentials-ef7b940e96ae8ec9c7a45645cdc3b7c9bff776d8.tar Essentials-ef7b940e96ae8ec9c7a45645cdc3b7c9bff776d8.tar.gz Essentials-ef7b940e96ae8ec9c7a45645cdc3b7c9bff776d8.tar.lz Essentials-ef7b940e96ae8ec9c7a45645cdc3b7c9bff776d8.tar.xz Essentials-ef7b940e96ae8ec9c7a45645cdc3b7c9bff776d8.zip |
More user feedback on enchant sign.
-rw-r--r-- | Essentials/src/com/earth2me/essentials/signs/SignEnchant.java | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/Essentials/src/com/earth2me/essentials/signs/SignEnchant.java b/Essentials/src/com/earth2me/essentials/signs/SignEnchant.java index 39f52436b..bf92a17f8 100644 --- a/Essentials/src/com/earth2me/essentials/signs/SignEnchant.java +++ b/Essentials/src/com/earth2me/essentials/signs/SignEnchant.java @@ -17,7 +17,16 @@ public class SignEnchant extends EssentialsSign @Override protected boolean onSignCreate(final ISign sign, final User player, final String username, final IEssentials ess) throws SignException, ChargeException { - final ItemStack stack = sign.getLine(1).equals("*") || sign.getLine(1).equalsIgnoreCase("any") ? null : getItemStack(sign.getLine(1), 1, ess); + final ItemStack stack; + try + { + stack = sign.getLine(1).equals("*") || sign.getLine(1).equalsIgnoreCase("any") ? null : getItemStack(sign.getLine(1), 1, ess); + } + catch (SignException e) + { + sign.setLine(1, "§c<item|any>"); + throw e; + } final String[] enchantLevel = sign.getLine(2).split(":"); if (enchantLevel.length != 2) { @@ -132,6 +141,16 @@ public class SignEnchant extends EssentialsSign throw new SignException(ex.getMessage(), ex); } + final String enchantmentName = enchantment.getName().toLowerCase(Locale.ENGLISH); + if (level == 0) + { + player.sendMessage(_("enchantmentRemoved", enchantmentName.replace('_', ' '))); + } + else + { + player.sendMessage(_("enchantmentApplied", enchantmentName.replace('_', ' '))); + } + charge.charge(player); Trade.log("Sign", "Enchant", "Interact", username, charge, username, charge, sign.getBlock().getLocation(), ess); player.updateInventory(); |