From f87110749e8e0f2070841986f5b0b41be6a52bad Mon Sep 17 00:00:00 2001 From: GJ Date: Wed, 2 Oct 2013 09:03:09 -0400 Subject: [PATCH] ACTUALLY fix the NPE here. --- .../com/gmail/nossr50/skills/axes/AxesManager.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java b/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java index 1943adb12..3fb509270 100644 --- a/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java +++ b/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java @@ -101,7 +101,15 @@ public class AxesManager extends SkillManager { Material armorType = armor.getType(); double durabilityModifier = 1 / (armor.getEnchantmentLevel(Enchantment.DURABILITY) + 1); // Modifier to simulate the durability enchantment behavior double modifiedDurabilityDamage = durabilityDamage * durabilityModifier; - short maxDurability = (short) Math.max(armorType.getMaxDurability(), mcMMO.getRepairableManager().getRepairable(armorType).getMaximumDurability()); + short maxDurability; + + try { + maxDurability = mcMMO.getRepairableManager().getRepairable(armorType).getMaximumDurability(); + } + catch (NullPointerException e) { + maxDurability = armorType.getMaxDurability(); + } + double maxDurabilityDamage = maxDurability * Axes.impactMaxDurabilityModifier; armor.setDurability((short) (Math.min(modifiedDurabilityDamage, maxDurabilityDamage) + armor.getDurability()));