From 897571db7d838f0f2ff86cfb40b59fd0349f4974 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Wed, 4 Jan 2012 18:34:37 +0000 Subject: Possible sign refactor? --- EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java | 5 +---- EssentialsSigns/src/com/earth2me/essentials/signs/SignTrade.java | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'EssentialsSigns/src/com/earth2me/essentials/signs') 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); -- cgit v1.2.3