From 9b651da09fd6880548b0bf4e61a078bac2a681ae Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Sun, 3 Sep 2023 19:39:47 +0100
Subject: [PATCH] Fixed error when updating a projectile entity's owner

---
 .../unicopia/projectile/MagicProjectileEntity.java  | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java b/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java
index 81b27fa2..cff6faf8 100644
--- a/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java
+++ b/src/main/java/com/minelittlepony/unicopia/projectile/MagicProjectileEntity.java
@@ -69,7 +69,7 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster<Ma
     private final EntityPhysics<MagicProjectileEntity> physics = new EntityPhysics<>(this, GRAVITY, false);
 
     private final EntityReference<Entity> homingTarget = new EntityReference<>();
-    private final EntityReference<LivingEntity> owner = new EntityReference<>();
+    private EntityReference<LivingEntity> owner;
 
     public MagicProjectileEntity(EntityType<MagicProjectileEntity> type, World world) {
         super(type, world);
@@ -115,7 +115,7 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster<Ma
     public void setOwner(@Nullable Entity entity) {
         super.setOwner(entity);
         if (entity instanceof LivingEntity l) {
-            this.owner.set(l);
+            getMasterReference().set(l);
         }
     }
 
@@ -128,6 +128,9 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster<Ma
 
     @Override
     public EntityReference<LivingEntity> getMasterReference() {
+        if (owner == null) {
+            owner = new EntityReference<>();
+        }
         return owner;
     }
 
@@ -256,7 +259,7 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster<Ma
         super.readCustomDataFromNbt(compound);
         physics.fromNBT(compound);
         homingTarget.fromNBT(compound.getCompound("homingTarget"));
-        owner.fromNBT(compound.getCompound("owner"));
+        getMasterReference().fromNBT(compound.getCompound("owner"));
         if (compound.contains("effect")) {
             getSpellSlot().put(Spell.readNbt(compound.getCompound("effect")));
         }
@@ -267,7 +270,7 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster<Ma
         super.writeCustomDataToNbt(compound);
         physics.toNBT(compound);
         compound.put("homingTarget", homingTarget.toNBT());
-        compound.put("owner", owner.toNBT());
+        compound.put("owner", getMasterReference().toNBT());
         getSpellSlot().get(true).ifPresent(effect -> {
             compound.put("effect", Spell.writeNbt(effect));
         });
@@ -325,7 +328,7 @@ public class MagicProjectileEntity extends ThrownItemEntity implements Caster<Ma
         try {
             Optional.ofNullable(predicate.apply(getItem().getItem())).ifPresent(consumer);
         } catch (Throwable t) {
-            Unicopia.LOGGER.error("Error whilst ticking spell on entity {}", owner, t);
+            Unicopia.LOGGER.error("Error whilst ticking spell on entity {}", getMasterReference(), t);
         }
     }