diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-01-04 18:34:37 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-01-04 18:34:37 +0000 |
| commit | 897571db7d838f0f2ff86cfb40b59fd0349f4974 (patch) | |
| tree | 49ba3279d3e94c038ae910b5df47b7e1ebbf94cd /EssentialsSigns | |
| parent | de0a4194763173ef7e624f3910fa424ffeefadfc (diff) | |
| download | Essentials-897571db7d838f0f2ff86cfb40b59fd0349f4974.tar Essentials-897571db7d838f0f2ff86cfb40b59fd0349f4974.tar.gz Essentials-897571db7d838f0f2ff86cfb40b59fd0349f4974.tar.lz Essentials-897571db7d838f0f2ff86cfb40b59fd0349f4974.tar.xz Essentials-897571db7d838f0f2ff86cfb40b59fd0349f4974.zip | |
Possible sign refactor?
Diffstat (limited to 'EssentialsSigns')
| -rw-r--r-- | EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java | 5 | ||||
| -rw-r--r-- | EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java index fd84bd0f3..628ed64c1 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java @@ -27,10 +27,7 @@ public class SignBuy extends EssentialsSign final Trade items = getTrade(sign, 1, 2, player, ess); final Trade charge = getTrade(sign, 3, ess); charge.isAffordableFor(player); - if (!items.pay(player, false)) - { - throw new ChargeException("Inventory full"); - } + items.pay(player, false); charge.charge(player); Trade.log("Sign", "Buy", "Interact", username, charge, username, items, sign.getBlock().getLocation(), ess); return true; diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java index 04db5511c..df913eced 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java @@ -55,10 +55,7 @@ public class SignTrade extends EssentialsSign final Trade charge = getTrade(sign, 1, false, false, ess); final Trade trade = getTrade(sign, 2, false, true, ess); charge.isAffordableFor(player); - if (!trade.pay(player, false)) - { - throw new ChargeException("Full inventory"); - } + trade.pay(player, false); substractAmount(sign, 2, trade, ess); addAmount(sign, 1, charge, ess); charge.charge(player); |