From 0f1eb9b4f910b4f61f4c89fbad14b6485c372756 Mon Sep 17 00:00:00 2001 From: snowleo Date: Wed, 14 Dec 2011 16:04:15 +0100 Subject: Moved signs code to a new module --- .../src/com/earth2me/essentials/signs/SignBuy.java | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java (limited to 'EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java') diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java new file mode 100644 index 000000000..fd84bd0f3 --- /dev/null +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java @@ -0,0 +1,38 @@ +package com.earth2me.essentials.signs; + +import com.earth2me.essentials.ChargeException; +import com.earth2me.essentials.api.IEssentials; +import com.earth2me.essentials.Trade; +import com.earth2me.essentials.api.IUser; + + +public class SignBuy extends EssentialsSign +{ + public SignBuy() + { + super("Buy"); + } + + @Override + protected boolean onSignCreate(final ISign sign, final IUser player, final String username, final IEssentials ess) throws SignException + { + validateTrade(sign, 1, 2, player, ess); + validateTrade(sign, 3, ess); + return true; + } + + @Override + protected boolean onSignInteract(final ISign sign, final IUser player, final String username, final IEssentials ess) throws SignException, ChargeException + { + 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"); + } + charge.charge(player); + Trade.log("Sign", "Buy", "Interact", username, charge, username, items, sign.getBlock().getLocation(), ess); + return true; + } +} -- cgit v1.2.3 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 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java') 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; -- cgit v1.2.3 From a46f6fd73decdc47e5c2bf29c563d0deb20f0735 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Wed, 4 Jan 2012 18:56:36 +0000 Subject: Revert "Possible sign refactor?" This reverts commit 897571db7d838f0f2ff86cfb40b59fd0349f4974. --- EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java') diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java index 628ed64c1..fd84bd0f3 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java @@ -27,7 +27,10 @@ public class SignBuy extends EssentialsSign final Trade items = getTrade(sign, 1, 2, player, ess); final Trade charge = getTrade(sign, 3, ess); charge.isAffordableFor(player); - items.pay(player, false); + if (!items.pay(player, false)) + { + throw new ChargeException("Inventory full"); + } charge.charge(player); Trade.log("Sign", "Buy", "Interact", username, charge, username, items, sign.getBlock().getLocation(), ess); return true; -- cgit v1.2.3 From 3513d72a7b883701ba8d90c523da5af8bf4d0d07 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Wed, 4 Jan 2012 21:41:05 +0000 Subject: Fixing Warp, Spawnmob signs Fix Imports --- EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java') diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java index fd84bd0f3..e35e78b50 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java @@ -1,8 +1,8 @@ package com.earth2me.essentials.signs; import com.earth2me.essentials.ChargeException; -import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.Trade; +import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.api.IUser; -- cgit v1.2.3 From 224e5f129eb4a18a46c063fc290a26abce247d9c Mon Sep 17 00:00:00 2001 From: Paul Buonopane Date: Thu, 23 Feb 2012 12:14:33 -0500 Subject: ChargeException was in the correct folder, but had the wrong package header. Signed-off-by: Paul Buonopane --- EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java') diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java index e35e78b50..90deed418 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java @@ -1,6 +1,6 @@ package com.earth2me.essentials.signs; -import com.earth2me.essentials.ChargeException; +import com.earth2me.essentials.api.ChargeException; import com.earth2me.essentials.Trade; import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.api.IUser; -- cgit v1.2.3 From 90acb796f475356a9110af7ceb915efd80624de2 Mon Sep 17 00:00:00 2001 From: snowleo Date: Wed, 14 Mar 2012 03:58:53 +0100 Subject: Trade is part of Economy --- EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java') diff --git a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java b/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java index 90deed418..1f5951a16 100644 --- a/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java +++ b/EssentialsSigns/src/com/earth2me/essentials/signs/SignBuy.java @@ -1,7 +1,7 @@ package com.earth2me.essentials.signs; import com.earth2me.essentials.api.ChargeException; -import com.earth2me.essentials.Trade; +import com.earth2me.essentials.economy.Trade; import com.earth2me.essentials.api.IEssentials; import com.earth2me.essentials.api.IUser; -- cgit v1.2.3