소스 검색

ACTUALLY fix the NPE here.

GJ 11 년 전
부모
커밋
f87110749e
1개의 변경된 파일9개의 추가작업 그리고 1개의 파일을 삭제
  1. 9 1
      src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java

+ 9 - 1
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()));