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, Equine, 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(); }