TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-08-06 04:23:02 +00:00
Code Issues Projects Releases Wiki Activity

[trunk] Worth: Don't default to 0.0, default to NaN.

Browse source 
git-svn-id: https://svn.java.net/svn/essentials~svn/trunk@1225 e251c2fe-e539-e718-e476-b85c1f46cddb
This commit is contained in:
snowleo 2011-04-16 15:25:48 +00:00
parent a1b89ee75c
commit 8ede5aad01
3 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Essentials/src/com/earth2me/essentials/Worth.java
View file

@ -27,7 +27,7 @@ public class Worth implements IConf
result = config.getDouble("worth."+itemStack.getType().toString().toLowerCase().replace("_", ""), Double.NaN); result = config.getDouble("worth."+itemStack.getType().toString().toLowerCase().replace("_", ""), Double.NaN);
} }
if (Double.isNaN(result)) { if (Double.isNaN(result)) {
result = config.getDouble("worth-"+itemStack.getTypeId(), 0.0); result = config.getDouble("worth-"+itemStack.getTypeId(), Double.NaN);
} }
return result; return result;
} }

2
Essentials/src/com/earth2me/essentials/commands/Commandsell.java
View file

@ -37,7 +37,7 @@ public class Commandsell extends EssentialsCommand
boolean stack = args.length > 1 && args[1].endsWith("s"); boolean stack = args.length > 1 && args[1].endsWith("s");
boolean requireStack = parent.getConfiguration().getBoolean("trade-in-stacks-" + id, false); boolean requireStack = parent.getConfiguration().getBoolean("trade-in-stacks-" + id, false);
if (worth < 1) { if (Double.isNaN(worth)) {
throw new Exception("That item cannot be sold to the server."); throw new Exception("That item cannot be sold to the server.");
} }
if (requireStack && !stack) { if (requireStack && !stack) {

3
Essentials/src/com/earth2me/essentials/commands/Commandworth.java
View file

@ -37,6 +37,9 @@ public class Commandworth extends EssentialsCommand
is.setAmount(amount); is.setAmount(amount);
double worth = Essentials.getWorth().getPrice(is); double worth = Essentials.getWorth().getPrice(is);
if (Double.isNaN(worth)) {
throw new Exception("That item cannot be sold to the server.");
}
user.charge(this); user.charge(this);
user.sendMessage("§7Stack of " + is.getType().toString().toLowerCase().replace("_", "") + " worth §c$" + (worth * amount) + "§7 (" + amount + " item(s) at $" + worth + " each)"); user.sendMessage("§7Stack of " + is.getType().toString().toLowerCase().replace("_", "") + " worth §c$" + (worth * amount) + "§7 (" + amount + " item(s) at $" + worth + " each)");