Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-12-26 19:18:29 +01:00
Code Issues Projects Releases Wiki Activity

Fix: Player was unable to use any commands, if his money was negative.

Browse Source
This commit is contained in:
snowleo 2011-06-25 22:23:11 +02:00
parent 953ce38d63
commit fb834bf104
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Essentials/src/com/earth2me/essentials/Trade.java
View File

@ -39,6 +39,7 @@ public class Trade
final double mon = user.getMoney(); final double mon = user.getMoney();
if (getMoney() != null if (getMoney() != null
&& mon < getMoney() && mon < getMoney()
&& getMoney() > 0
&& !user.isAuthorized("essentials.eco.loan")) && !user.isAuthorized("essentials.eco.loan"))
{ {
throw new ChargeException(Util.i18n("notEnoughMoney")); throw new ChargeException(Util.i18n("notEnoughMoney"));
@ -54,6 +55,7 @@ public class Trade
&& !user.isAuthorized("essentials.nocommandcost.all") && !user.isAuthorized("essentials.nocommandcost.all")
&& !user.isAuthorized("essentials.nocommandcost." + command) && !user.isAuthorized("essentials.nocommandcost." + command)
&& mon < ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : 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")) && !user.isAuthorized("essentials.eco.loan"))
{ {
throw new ChargeException(Util.i18n("notEnoughMoney")); throw new ChargeException(Util.i18n("notEnoughMoney"));
@ -62,7 +64,7 @@ public class Trade
public void pay(final IUser user) public void pay(final IUser user)
{ {
if (getMoney() != null) if (getMoney() != null && getMoney() > 0)
{ {
user.giveMoney(getMoney()); user.giveMoney(getMoney());
} }
@ -82,7 +84,7 @@ public class Trade
if (getMoney() != null) if (getMoney() != null)
{ {
final double mon = user.getMoney(); 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")); throw new ChargeException(Util.i18n("notEnoughMoney"));
} }
@ -103,7 +105,7 @@ public class Trade
{ {
final double mon = user.getMoney(); final double mon = user.getMoney();
final double cost = ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command); 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")); throw new ChargeException(Util.i18n("notEnoughMoney"));
} }