From ee84df1bc19cbc5a382b38ba1051024cd9a9c7db Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Sat, 5 Oct 2024 03:15:21 +0100
Subject: [PATCH] Fix crash resolving an entity reference

---
 .../com/minelittlepony/unicopia/entity/EntityReference.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/minelittlepony/unicopia/entity/EntityReference.java b/src/main/java/com/minelittlepony/unicopia/entity/EntityReference.java
index 93f955b1..04b5408c 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/EntityReference.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/EntityReference.java
@@ -116,7 +116,7 @@ public class EntityReference<T extends Entity> implements NbtSerialisable, Track
     @Nullable
     public T get(World world) {
         T t = directReference.get();
-        if (t == null) {
+        if (t == null && reference != null) {
             directReference = new WeakReference<>(t = reference.resolve(world).orElse(null));
         }
         return t;