minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-22 14:23:09 +02:00
Code Issues Releases Wiki Activity

2.9 to 3.0

Browse Source 
Trade file fixes
This commit is contained in:
ementalo
2012-05-29 22:51:15 +01:00
parent 0af4103b92
commit 53d54146d6
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Essentials/src/com/earth2me/essentials/economy/Trade.java
View File

@@ -72,7 +72,7 @@ public class Trade
{ {
if (getMoney() != null if (getMoney() != null
&& getMoney() > 0 && getMoney() > 0
&& !Permissions.ECO_LOAN.isAuthorized(user)) && !Permissions.ECO_LOAN.isAuthorized(user)
&& !user.canAfford(getMoney())) && !user.canAfford(getMoney()))
{ {
throw new ChargeException(_("notEnoughMoney")); throw new ChargeException(_("notEnoughMoney"));
@@ -90,7 +90,7 @@ public class Trade
if (command != null && !command.isEmpty() if (command != null && !command.isEmpty()
&& !NoCommandCostPermissions.getPermission(command).isAuthorized(user) && !NoCommandCostPermissions.getPermission(command).isAuthorized(user)
&& mon < settings.getData().getEconomy().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command) && 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 < settings.getData().getEconomy().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command)
&& !Permissions.ECO_LOAN.isAuthorized(user)) && !Permissions.ECO_LOAN.isAuthorized(user))
{ {
@@ -217,13 +217,13 @@ public class Trade
{ {
double cost = 0d; double cost = 0d;
if (command != null && !command.isEmpty() if (command != null && !command.isEmpty()
&& !user.isAuthorized("essentials.nocommandcost.all") && !NoCommandCostPermissions.getPermission("all").isAuthorized(user)
&& !user.isAuthorized("essentials.nocommandcost." + command)) && !NoCommandCostPermissions.getPermission(command).isAuthorized(user))
{ {
cost = ess.getSettings().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command); cost = ess.getSettings().getData().getEconomy().getCommandCost(command.charAt(0) == '/' ? command.substring(1) : command);
if (cost == 0.0 && fallbackCommand != null && !fallbackCommand.isEmpty()) if (cost == 0.0 && fallbackCommand != null && !fallbackCommand.isEmpty())
{ {
cost = ess.getSettings().getCommandCost(fallbackCommand.charAt(0) == '/' ? fallbackCommand.substring(1) : fallbackCommand); cost = ess.getSettings().getData().getEconomy().getCommandCost(fallbackCommand.charAt(0) == '/' ? fallbackCommand.substring(1) : fallbackCommand);
} }
} }
return cost; return cost;