From 6a152d02047ed82ecce5183b3d8c63361b683aef Mon Sep 17 00:00:00 2001 From: Nonoriri Date: Sun, 24 Nov 2013 14:07:47 -0500 Subject: [PATCH] Fixed error due to getEnchantmentNumb being called for halloween item lore. --- BankEconomyMod/src/me/kaZep/Base/PlayerListener.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java index d7912c6..eff3278 100644 --- a/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java +++ b/BankEconomyMod/src/me/kaZep/Base/PlayerListener.java @@ -13355,7 +13355,7 @@ class updateInventoryTask implements Runnable { if (itemEnchantments.get(e) == null || bookEnchantments.get(e) > itemEnchantments.get(e)) { // Book enchantment is larger in magnitude. Assign it as a possible outcome. probableEnchantments.put(e, bookEnchantments.get(e)); - } else if (bookEnchantments.get(e) == itemEnchantments.get(e) && bookEnchantments.get(e) <= 10) { + } else if (bookEnchantments.get(e) == itemEnchantments.get(e) && bookEnchantments.get(e) < 10) { // Book enchantment is same in magnitude. Upgrade by one level. probableEnchantments.put(e, bookEnchantments.get(e) + 1); } @@ -13766,7 +13766,7 @@ class updateInventoryTask implements Runnable { public double getEnchantmentNumb(String s) { //Parse the string for spaces. String[] enchant = s.split(" "); - if (enchant[0].contains(ChatColor.YELLOW+"")) { + if (enchant[0].contains(ChatColor.YELLOW+"") && (enchant.length > 1)) { String newstring = ((enchant[0].replace(ChatColor.YELLOW.getChar(), ' ')).replace('%', ' ')).replace(Character.toString((char)0x00A7), Character.toString((char)0x0020)); // Bukkit.getLogger().info("Enchant number is "+Double.valueOf(newstring)); return Double.valueOf(newstring);