summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorementalo <ementalodev@gmx.co.uk>2012-06-29 01:05:17 +0100
committerementalo <ementalodev@gmx.co.uk>2012-06-29 01:05:17 +0100
commit9579917efafe58a1aefb9df6a1591960f90d2c72 (patch)
tree66a4fcfe042bc43d8c46b992ddfd417f3ceacd8b
parent7ed07dedba64347ac0f3907810432152eb9ef474 (diff)
downloadEssentials-9579917efafe58a1aefb9df6a1591960f90d2c72.tar
Essentials-9579917efafe58a1aefb9df6a1591960f90d2c72.tar.gz
Essentials-9579917efafe58a1aefb9df6a1591960f90d2c72.tar.lz
Essentials-9579917efafe58a1aefb9df6a1591960f90d2c72.tar.xz
Essentials-9579917efafe58a1aefb9df6a1591960f90d2c72.zip
Commandcost fix
-rw-r--r--Essentials/src/net/ess3/economy/Trade.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/Essentials/src/net/ess3/economy/Trade.java b/Essentials/src/net/ess3/economy/Trade.java
index a5225a13a..9a260ba2b 100644
--- a/Essentials/src/net/ess3/economy/Trade.java
+++ b/Essentials/src/net/ess3/economy/Trade.java
@@ -88,10 +88,9 @@ public class Trade
final ISettings settings = ess.getSettings();
settings.acquireReadLock();
+ double money;
if (command != null && !command.isEmpty()
- && !NoCommandCostPermissions.getPermission(command).isAuthorized(user)
- && money < settings.getData().getEconomy().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command)
- && 0 < settings.getData().getEconomy().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command)
+ && 0 < (money = getCommandCost(user))
&& !Permissions.ECO_LOAN.isAuthorized(user))
{
throw new ChargeException(_("notEnoughMoney"));