From c2396bcd5ec4238c69a08e3e510104ef4c045cca Mon Sep 17 00:00:00 2001 From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com> Date: Tue, 30 Jun 2020 15:17:35 +0100 Subject: [PATCH] Fix NPE --- src/main/java/electroblob/wizardry/spell/SpellThrowable.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/electroblob/wizardry/spell/SpellThrowable.java b/src/main/java/electroblob/wizardry/spell/SpellThrowable.java index 06201ddd..515583b7 100644 --- a/src/main/java/electroblob/wizardry/spell/SpellThrowable.java +++ b/src/main/java/electroblob/wizardry/spell/SpellThrowable.java @@ -157,7 +157,7 @@ public class SpellThrowable extends Spell { public static void onLivingAttackEvent(LivingAttackEvent event){ // TODO: Annoyingly, wither skulls apply 'direct' damage from their shooter so they won't be recognised here - if(!(event.getSource() instanceof MagicDamage)){ // Prevent infinite looping + if(event.getSource().getImmediateSource() != null && !(event.getSource() instanceof MagicDamage)){ // Prevent infinite looping float damageModifier = event.getSource().getImmediateSource().getEntityData().getFloat(DAMAGE_MODIFIER_NBT_KEY);