From 1ab674136b0faa93835959b7bc0e935a44926f39 Mon Sep 17 00:00:00 2001
From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com>
Date: Tue, 31 Mar 2020 21:37:38 +0100
Subject: [PATCH] Add null check for riding entity to magic slimes, fixes #379

---
 .../wizardry/entity/living/EntityMagicSlime.java            | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/electroblob/wizardry/entity/living/EntityMagicSlime.java b/src/main/java/electroblob/wizardry/entity/living/EntityMagicSlime.java
index 183fb155..725186fc 100644
--- a/src/main/java/electroblob/wizardry/entity/living/EntityMagicSlime.java
+++ b/src/main/java/electroblob/wizardry/entity/living/EntityMagicSlime.java
@@ -120,8 +120,10 @@ public class EntityMagicSlime extends EntitySlime implements ISummonedCreature {
 				&& ((EntityLivingBase)this.getRidingEntity()).getHealth() > 0){
 			if(this.ticksExisted % 16 == 1){
 				this.getRidingEntity().attackEntityFrom(DamageSource.MAGIC, 1);
-				((EntityLivingBase)this.getRidingEntity())
-						.addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, 20, 2));
+				if(this.getRidingEntity() != null){ // Some mobs force-dismount when attacked (normally when dying)
+					((EntityLivingBase)this.getRidingEntity())
+							.addPotionEffect(new PotionEffect(MobEffects.SLOWNESS, 20, 2));
+				}
 				this.playSound(WizardrySounds.ENTITY_MAGIC_SLIME_ATTACK, 1.0f, 1.0f);
 				this.squishAmount = 0.5F;
 			}