Răsfoiți Sursa

Try/catch was stupid.

GJ 11 ani în urmă
părinte
comite
5541c15753

+ 1 - 9
src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java

@@ -101,15 +101,7 @@ public class AxesManager extends SkillManager {
                 Material armorType = armor.getType();
                 Material armorType = armor.getType();
                 double durabilityModifier = 1 / (armor.getEnchantmentLevel(Enchantment.DURABILITY) + 1); // Modifier to simulate the durability enchantment behavior
                 double durabilityModifier = 1 / (armor.getEnchantmentLevel(Enchantment.DURABILITY) + 1); // Modifier to simulate the durability enchantment behavior
                 double modifiedDurabilityDamage = durabilityDamage * durabilityModifier;
                 double modifiedDurabilityDamage = durabilityDamage * durabilityModifier;
-                short maxDurability;
-
-                try {
-                    maxDurability = mcMMO.getRepairableManager().getRepairable(armorType).getMaximumDurability();
-                }
-                catch (NullPointerException e) {
-                    maxDurability = armorType.getMaxDurability();
-                }
-
+                short maxDurability = mcMMO.getRepairableManager().isRepairable(armorType) ? mcMMO.getRepairableManager().getRepairable(armorType).getMaximumDurability() : armorType.getMaxDurability();
                 double maxDurabilityDamage = maxDurability * Axes.impactMaxDurabilityModifier;
                 double maxDurabilityDamage = maxDurability * Axes.impactMaxDurabilityModifier;
 
 
                 armor.setDurability((short) (Math.min(modifiedDurabilityDamage, maxDurabilityDamage) + armor.getDurability()));
                 armor.setDurability((short) (Math.min(modifiedDurabilityDamage, maxDurabilityDamage) + armor.getDurability()));