From 5152f7a4d3ca2b37e36f3295e476364f1d3340f1 Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Fri, 9 Oct 2020 12:59:54 +0200
Subject: [PATCH] Fixed spells being carried over through death

---
 .../java/com/minelittlepony/unicopia/entity/player/Pony.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
index e7de0ace..dede1505 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/player/Pony.java
@@ -436,7 +436,9 @@ public class Pony implements Caster<PlayerEntity>, Equine<PlayerEntity>, Transmi
     @Override
     public void copyFrom(Pony oldPlayer) {
         speciesPersisted = oldPlayer.speciesPersisted;
-        setSpell(oldPlayer.getSpell(true));
+        if (!oldPlayer.getEntity().removed) {
+            setSpell(oldPlayer.getSpell(true));
+        }
         setSpecies(oldPlayer.getSpecies());
         setDirty();
     }