Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2025-01-11 19:02:02 +01:00
Code Issues Projects Releases Wiki Activity

Catch both exceptions in EssentialsConf and valueOf instead of new

Browse Source
This commit is contained in:
snowleo 2013-05-05 11:55:39 +02:00
parent 0d34b9ae9f
commit b49aaee66d
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Essentials/src/com/earth2me/essentials/EssentialsConf.java
View File

@ -542,6 +542,10 @@ public class EssentialsConf extends YamlConfiguration
{
return new BigDecimal(input, MathContext.DECIMAL128);
}
catch (NumberFormatException e)
{
return def;
}
catch (ArithmeticException e)
{
return def;

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

@ -184,7 +184,7 @@ public class Trade
if (command != null)
{
final BigDecimal cost = getCommandCost(user);
if (!user.canAfford(cost) && cost.compareTo(BigDecimal.ZERO) > 0)
if (!user.canAfford(cost) && cost.signum() > 0)
{
throw new ChargeException(_("notEnoughMoney"));
}

4
Essentials/src/com/earth2me/essentials/commands/Commandsell.java
View File

@ -147,11 +147,11 @@ public class Commandsell extends EssentialsCommand
}
else
{
return worth.multiply(new BigDecimal(amount));
return worth.multiply(BigDecimal.valueOf(amount));
}
}
BigDecimal result = worth.multiply(new BigDecimal(amount));
BigDecimal result = worth.multiply(BigDecimal.valueOf(amount));
//TODO: Prices for Enchantments
final ItemStack ris = is.clone();
ris.setAmount(amount);

4
Essentials/src/com/earth2me/essentials/commands/Commandworth.java
View File

@ -48,7 +48,7 @@ public class Commandworth extends EssentialsCommand
throw new Exception(_("itemCannotBeSold"));
}
final BigDecimal result = worth.multiply(new BigDecimal(amount));
final BigDecimal result = worth.multiply(BigDecimal.valueOf(amount));
user.sendMessage(iStack.getDurability() != 0
? _("worthMeta",
@ -94,7 +94,7 @@ public class Commandworth extends EssentialsCommand
throw new Exception(_("itemCannotBeSold"));
}
final BigDecimal result = worth.multiply(new BigDecimal(amount));
final BigDecimal result = worth.multiply(BigDecimal.valueOf(amount));
sender.sendMessage(iStack.getDurability() != 0
? _("worthMeta",