Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-11-09 04:20:42 +01:00
Code Issues Projects Releases Wiki Activity

Removed duplicated message.

Browse Source 
Command costs are double values now

git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1532 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
snowleo 2011-05-23 09:55:23 +00:00
parent 6b65c5cc83
commit a7217b5f03
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Essentials/src/com/earth2me/essentials/Charge.java
View File

@ -66,14 +66,13 @@ public class Charge
public void charge(User user) throws Exception public void charge(User user) throws Exception
{ {
double mon = user.getMoney(); double mon = user.getMoney();
if (costs != null && costs != 0.0) if (costs != null)
{ {
if (mon < costs && !user.isAuthorized("essentials.eco.loan")) if (mon < costs && !user.isAuthorized("essentials.eco.loan"))
{ {
throw new Exception(Util.i18n("notEnoughMoney")); throw new Exception(Util.i18n("notEnoughMoney"));
} }
user.takeMoney(costs); user.takeMoney(costs);
user.sendMessage(Util.format("moneyTaken", Util.formatCurrency(costs)));
} }
if (items != null) if (items != null)
{ {
@ -92,16 +91,12 @@ public class Charge
return; return;
} }
int cost = ess.getSettings().getCommandCost(command.startsWith("/") ? command.substring(1) : command); double cost = ess.getSettings().getCommandCost(command.startsWith("/") ? command.substring(1) : command);
if (cost != 0)
{
if (mon < cost && !user.isAuthorized("essentials.eco.loan")) if (mon < cost && !user.isAuthorized("essentials.eco.loan"))
{ {
throw new Exception(Util.i18n("notEnoughMoney")); throw new Exception(Util.i18n("notEnoughMoney"));
} }
user.takeMoney(cost); user.takeMoney(cost);
user.sendMessage(Util.format("moneyTaken", Util.formatCurrency(cost)));
}
} }
} }
} }

10
Essentials/src/com/earth2me/essentials/Settings.java
View File

@ -101,16 +101,16 @@ public class Settings implements IConf
return config.getBoolean("override-" + name.toLowerCase(), false); return config.getBoolean("override-" + name.toLowerCase(), false);
} }
public int getCommandCost(IEssentialsCommand cmd) public double getCommandCost(IEssentialsCommand cmd)
{ {
return getCommandCost(cmd.getName()); return getCommandCost(cmd.getName());
} }
public int getCommandCost(String label) public double getCommandCost(String label)
{ {
int cost = config.getInt("command-costs." + label, 0); double cost = config.getDouble("command-costs." + label, 0.0);
if (cost == 0) if (cost == 0.0)
cost = config.getInt("cost-" + label, 0); cost = config.getDouble("cost-" + label, 0.0);
return cost; return cost;
} }