TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2024-09-17 15:45:51 +00:00
Code Issues Projects Releases Wiki Activity

Fix isAffordableFor in Trade class

Browse source 
This fixes buy signs giving out items, when the player has essentials.eco.loan permission, but min-money in config is set to 0.
This commit is contained in:
snowleo 2012-03-28 10:36:10 +02:00
parent a7df8a1a0a
commit 32c689e0f5
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Essentials/src/com/earth2me/essentials/Trade.java
View file

@ -56,11 +56,9 @@ public class Trade
public void isAffordableFor(final IUser user) throws ChargeException public void isAffordableFor(final IUser user) throws ChargeException
{ {
final double mon = user.getMoney();
if (getMoney() != null if (getMoney() != null
&& mon < getMoney()
&& getMoney() > 0 && getMoney() > 0
&& !user.isAuthorized("essentials.eco.loan")) && user.canAfford(getMoney()))
{ {
throw new ChargeException(_("notEnoughMoney")); throw new ChargeException(_("notEnoughMoney"));
} }
@ -71,12 +69,10 @@ public class Trade
throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " "))); throw new ChargeException(_("missingItems", getItemStack().getAmount(), getItemStack().getType().toString().toLowerCase(Locale.ENGLISH).replace("_", " ")));
} }
double money;
if (command != null && !command.isEmpty() if (command != null && !command.isEmpty()
&& !user.isAuthorized("essentials.nocommandcost.all") && 0 < (money = getCommandCost(user))
&& !user.isAuthorized("essentials.nocommandcost." + command) && user.canAfford(money))
&& 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(_("notEnoughMoney")); throw new ChargeException(_("notEnoughMoney"));
} }