diff options
| author | snowleo <schneeleo@gmail.com> | 2012-03-28 10:36:10 +0200 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2012-03-28 10:36:10 +0200 |
| commit | 32c689e0f5a275d37df941d8e9e24caa62ef5890 (patch) | |
| tree | 0f672e9eb053137a86103926e401a65f50104c27 | |
| parent | a7df8a1a0ac858bd943a9987b33783dddda4ba4c (diff) | |
| download | Essentials-32c689e0f5a275d37df941d8e9e24caa62ef5890.tar Essentials-32c689e0f5a275d37df941d8e9e24caa62ef5890.tar.gz Essentials-32c689e0f5a275d37df941d8e9e24caa62ef5890.tar.lz Essentials-32c689e0f5a275d37df941d8e9e24caa62ef5890.tar.xz Essentials-32c689e0f5a275d37df941d8e9e24caa62ef5890.zip | |
Fix isAffordableFor in Trade class
This fixes buy signs giving out items, when the player has essentials.eco.loan permission, but min-money in config is set to 0.
| -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..502d3e34d 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")); } |