From 78dd6ea26f1f6e7da084e738fa38ca57175cb63b Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Fri, 24 Apr 2020 19:36:30 +0200
Subject: [PATCH] Fixed NPE when accessing the attached properties for an
 entity

---
 .../unicopia/mixin/MixinLivingEntity.java         | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/minelittlepony/unicopia/mixin/MixinLivingEntity.java b/src/main/java/com/minelittlepony/unicopia/mixin/MixinLivingEntity.java
index a9a7baf7..6d747da3 100644
--- a/src/main/java/com/minelittlepony/unicopia/mixin/MixinLivingEntity.java
+++ b/src/main/java/com/minelittlepony/unicopia/mixin/MixinLivingEntity.java
@@ -16,7 +16,7 @@ import net.minecraft.entity.LivingEntity;
 @Mixin(LivingEntity.class)
 abstract class MixinLivingEntity extends Entity implements PonyContainer<Ponylike> {
 
-    private final Ponylike caster = create();
+    private Ponylike caster;
 
     private MixinLivingEntity() { super(null, null); }
 
@@ -27,12 +27,15 @@ abstract class MixinLivingEntity extends Entity implements PonyContainer<Ponylik
 
     @Override
     public Ponylike get() {
+        if (caster == null) {
+            caster = create();
+        }
         return caster;
     }
 
     @Inject(method = "canSee(Lnet/minecraft/entity/Entity;)Z", at = @At("HEAD"))
     private void onCanSee(Entity other, CallbackInfoReturnable<Boolean> info) {
-        if (caster.isInvisible()) {
+        if (get().isInvisible()) {
             info.setReturnValue(false);
         }
     }
@@ -42,25 +45,25 @@ abstract class MixinLivingEntity extends Entity implements PonyContainer<Ponylik
         LivingEntity self = (LivingEntity)(Object)this;
 
         if (!self.getActiveItem().isEmpty() && self.isUsingItem()) {
-            caster.onUse(self.getActiveItem());
+            get().onUse(self.getActiveItem());
         }
     }
 
     @Inject(method = "jump()V", at = @At("RETURN"))
     private void onJump(CallbackInfo info) {
-        caster.onJump();
+        get().onJump();
     }
 
     @Inject(method = "tick()V", at = @At("HEAD"), cancellable = true)
     private void beforeTick(CallbackInfo info) {
-        if (caster.beforeUpdate()) {
+        if (get().beforeUpdate()) {
             info.cancel();
         }
     }
 
     @Inject(method = "tick()V", at = @At("RETURN"))
     private void afterTick(CallbackInfo info) {
-        caster.onUpdate();
+        get().onUpdate();
     }
 
     @Inject(method = "<clinit>()V", at = @At("RETURN"), remap = false)