diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-03-28 15:03:45 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-03-28 15:03:45 +0100 |
| commit | 576642a573946bb2a279d4f7349d00d105431f08 (patch) | |
| tree | 79dcae22bd3d793ec68230737bf67305eb6222e9 | |
| parent | 9d545dcbf1fb95b6c2185de6f40e72708bdc53cd (diff) | |
| parent | 71d874484037b73e8eed93194d1f0a966bb389e1 (diff) | |
| download | Essentials-576642a573946bb2a279d4f7349d00d105431f08.tar Essentials-576642a573946bb2a279d4f7349d00d105431f08.tar.gz Essentials-576642a573946bb2a279d4f7349d00d105431f08.tar.lz Essentials-576642a573946bb2a279d4f7349d00d105431f08.tar.xz Essentials-576642a573946bb2a279d4f7349d00d105431f08.zip | |
Merge branch 'master' of github.com:essentials/Essentials
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Trade.java | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Trade.java b/Essentials/src/com/earth2me/essentials/Trade.java index fbdc471bd..730037d9a 100644 --- a/Essentials/src/com/earth2me/essentials/Trade.java +++ b/Essentials/src/com/earth2me/essentials/Trade.java @@ -56,11 +56,9 @@ public class Trade public void isAffordableFor(final IUser user) throws ChargeException { - final double mon = user.getMoney(); if (getMoney() != null - && mon < getMoney() && getMoney() > 0 - && !user.isAuthorized("essentials.eco.loan")) + && !user.canAfford(getMoney())) { throw new ChargeException(_("notEnoughMoney")); } @@ -71,12 +69,10 @@ public class Trade throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " "))); } + double money; if (command != null && !command.isEmpty() - && !user.isAuthorized("essentials.nocommandcost.all") - && !user.isAuthorized("essentials.nocommandcost." + command) - && mon < ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command) - && 0 < ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command) - && !user.isAuthorized("essentials.eco.loan")) + && 0 < (money = getCommandCost(user)) + && !user.canAfford(money)) { throw new ChargeException(_("notEnoughMoney")); } |