diff options
| author | snowleo <schneeleo@gmail.com> | 2013-05-05 11:55:39 +0200 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2013-05-05 11:55:39 +0200 |
| commit | 390cc4e6e2149770b13c3650e37ece94f6bf6627 (patch) | |
| tree | c2c532ba74d3dfb526290762d74ad9cae6a89d96 | |
| parent | 884790f9aad33ecbeaa7550af667fde2090a8486 (diff) | |
| download | Essentials-390cc4e6e2149770b13c3650e37ece94f6bf6627.tar Essentials-390cc4e6e2149770b13c3650e37ece94f6bf6627.tar.gz Essentials-390cc4e6e2149770b13c3650e37ece94f6bf6627.tar.lz Essentials-390cc4e6e2149770b13c3650e37ece94f6bf6627.tar.xz Essentials-390cc4e6e2149770b13c3650e37ece94f6bf6627.zip | |
Catch both exceptions in EssentialsConf and valueOf instead of new
4 files changed, 9 insertions, 5 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsConf.java b/Essentials/src/com/earth2me/essentials/EssentialsConf.java index 662afd89a..d0a27e7aa 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsConf.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsConf.java @@ -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; diff --git a/Essentials/src/com/earth2me/essentials/Trade.java b/Essentials/src/com/earth2me/essentials/Trade.java index 9506e72a9..78c210f99 100644 --- a/Essentials/src/com/earth2me/essentials/Trade.java +++ b/Essentials/src/com/earth2me/essentials/Trade.java @@ -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")); } diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandsell.java b/Essentials/src/com/earth2me/essentials/commands/Commandsell.java index a2d18fd7e..8bf5c7926 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandsell.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandsell.java @@ -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); diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandworth.java b/Essentials/src/com/earth2me/essentials/commands/Commandworth.java index 72d08d4fa..db1424249 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandworth.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandworth.java @@ -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", |