From cfdb049368eae7bdfb8b8cf0cfa7011c7b94efe7 Mon Sep 17 00:00:00 2001 From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com> Date: Mon, 16 Dec 2019 13:06:32 +0000 Subject: [PATCH] Add failsafe for conjured item max damage, fixes #288 --- src/main/java/electroblob/wizardry/item/IConjuredItem.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/electroblob/wizardry/item/IConjuredItem.java b/src/main/java/electroblob/wizardry/item/IConjuredItem.java index eadfe591..ea2dfb71 100644 --- a/src/main/java/electroblob/wizardry/item/IConjuredItem.java +++ b/src/main/java/electroblob/wizardry/item/IConjuredItem.java @@ -58,6 +58,8 @@ public interface IConjuredItem { */ default int getMaxDamageFromNBT(ItemStack stack, Spell spell){ + if(!spell.arePropertiesInitialised()) return 600; // Failsafe, some edge-cases call this during preInit + float baseDuration = spell.getProperty(SpellConjuration.ITEM_LIFETIME).floatValue(); if(stack.hasTagCompound() && stack.getTagCompound().hasKey(DURATION_MULTIPLIER_KEY)){