diff options
Diffstat (limited to 'EssentialsSigns/src/net/ess3/signs/SignTrade.java')
| -rw-r--r-- | EssentialsSigns/src/net/ess3/signs/SignTrade.java | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/EssentialsSigns/src/net/ess3/signs/SignTrade.java b/EssentialsSigns/src/net/ess3/signs/SignTrade.java index c3e78e226..0993a5498 100644 --- a/EssentialsSigns/src/net/ess3/signs/SignTrade.java +++ b/EssentialsSigns/src/net/ess3/signs/SignTrade.java @@ -75,16 +75,17 @@ public class SignTrade extends EssentialsSign private Trade rechargeSign(final ISign sign, final IEssentials ess, final IUser player) throws SignException, ChargeException { final Trade trade = getTrade(sign, 2, false, false, ess); - if (trade.getItemStack() != null && player.getItemInHand() != null - && trade.getItemStack().getTypeId() == player.getItemInHand().getTypeId() - && trade.getItemStack().getDurability() == player.getItemInHand().getDurability() - && trade.getItemStack().getEnchantments().equals(player.getItemInHand().getEnchantments())) + ItemStack itemInHand = player.getPlayer().getItemInHand(); + if (trade.getItemStack() != null && itemInHand != null + && trade.getItemStack().getTypeId() == itemInHand.getTypeId() + && trade.getItemStack().getDurability() == itemInHand.getDurability() + && trade.getItemStack().getEnchantments().equals(itemInHand.getEnchantments())) { - int amount = player.getItemInHand().getAmount(); + int amount = itemInHand.getAmount(); amount -= amount % trade.getItemStack().getAmount(); if (amount > 0) { - final ItemStack stack = player.getItemInHand().clone(); + final ItemStack stack = itemInHand.clone(); stack.setAmount(amount); final Trade store = new Trade(stack, ess); addAmount(sign, 2, store, ess); |