diff options
| author | snowleo <schneeleo@gmail.com> | 2011-06-25 22:23:11 +0200 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2011-06-25 22:23:11 +0200 |
| commit | fb834bf104571a36d4140de115117b12c0ff0136 (patch) | |
| tree | 0235a0ae56f981629d424c0755b41872a02a6805 | |
| parent | 953ce38d63309844e7d24b5d94396769d90ff3c5 (diff) | |
| download | Essentials-fb834bf104571a36d4140de115117b12c0ff0136.tar Essentials-fb834bf104571a36d4140de115117b12c0ff0136.tar.gz Essentials-fb834bf104571a36d4140de115117b12c0ff0136.tar.lz Essentials-fb834bf104571a36d4140de115117b12c0ff0136.tar.xz Essentials-fb834bf104571a36d4140de115117b12c0ff0136.zip | |
Fix: Player was unable to use any commands, if his money was negative.
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Trade.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Trade.java b/Essentials/src/com/earth2me/essentials/Trade.java index b4570d780..93d73acde 100644 --- a/Essentials/src/com/earth2me/essentials/Trade.java +++ b/Essentials/src/com/earth2me/essentials/Trade.java @@ -39,6 +39,7 @@ public class Trade final double mon = user.getMoney(); if (getMoney() != null && mon < getMoney() + && getMoney() > 0 && !user.isAuthorized("essentials.eco.loan")) { throw new ChargeException(Util.i18n("notEnoughMoney")); @@ -54,6 +55,7 @@ public class Trade && !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")) { throw new ChargeException(Util.i18n("notEnoughMoney")); @@ -62,7 +64,7 @@ public class Trade public void pay(final IUser user) { - if (getMoney() != null) + if (getMoney() != null && getMoney() > 0) { user.giveMoney(getMoney()); } @@ -82,7 +84,7 @@ public class Trade if (getMoney() != null) { final double mon = user.getMoney(); - if (mon < getMoney() && !user.isAuthorized("essentials.eco.loan")) + if (mon < getMoney() && getMoney() > 0 && !user.isAuthorized("essentials.eco.loan")) { throw new ChargeException(Util.i18n("notEnoughMoney")); } @@ -103,7 +105,7 @@ public class Trade { final double mon = user.getMoney(); final double cost = ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command); - if (mon < cost && !user.isAuthorized("essentials.eco.loan")) + if (mon < cost && cost > 0 && !user.isAuthorized("essentials.eco.loan")) { throw new ChargeException(Util.i18n("notEnoughMoney")); } |