Hopefully this fixes the crash with pose animation

mchorse · Feb 7, 2021 · ef468a2 · ef468a2
1 parent bfbc710
commit ef468a2
Showing 1 changed file with 7 additions and 26 deletions.
diff --git a/src/main/java/mchorse/blockbuster_pack/morphs/CustomMorph.java b/src/main/java/mchorse/blockbuster_pack/morphs/CustomMorph.java
@@ -246,7 +246,7 @@ public ModelPose getPose(EntityLivingBase target, boolean ignoreCustom, float pa
     {
         ModelPose pose = this.getCurrentPose(target, ignoreCustom);
 
-        if (this.animation.isInProgress())
+        if (this.animation.isInProgress() && pose != null)
         {
             return this.animation.calculatePose(pose, partialTicks);
         }
@@ -481,12 +481,12 @@ public void update(EntityLivingBase target)
 
         if (target.world.isRemote)
         {
-            this.updateCape(target);
+            this.updateCapeVariables(target);
         }
     }
 
     @SideOnly(Side.CLIENT)
-    private void updateCape(EntityLivingBase target)
+    private void updateCapeVariables(EntityLivingBase target)
     {
         this.prevCapeX = this.capeX;
         this.prevCapeY = this.capeY;
@@ -495,48 +495,29 @@ private void updateCape(EntityLivingBase target)
         double dX = target.posX - this.capeX;
         double dY = target.posY - this.capeY;
         double dZ = target.posZ - this.capeZ;
-        double distance = 10.0D;
         double multiplier = 0.25D;
 
-        if (dX > distance)
+        if (Math.abs(dX) > 10)
         {
             this.capeX = target.posX;
             this.prevCapeX = this.capeX;
         }
 
-        if (dZ > distance)
-        {
-            this.capeZ = target.posZ;
-            this.prevCapeZ = this.capeZ;
-        }
-
-        if (dY > distance)
+        if (Math.abs(dY) > 10)
         {
             this.capeY = target.posY;
             this.prevCapeY = this.capeY;
         }
 
-        if (dX < -distance)
-        {
-            this.capeX = target.posX;
-            this.prevCapeX = this.capeX;
-        }
-
-        if (dZ < -distance)
+        if (Math.abs(dZ) > 10)
         {
             this.capeZ = target.posZ;
             this.prevCapeZ = this.capeZ;
         }
 
-        if (dY < -distance)
-        {
-            this.capeY = target.posY;
-            this.prevCapeY = this.capeY;
-        }
-
         this.capeX += dX * multiplier;
-        this.capeZ += dZ * multiplier;
         this.capeY += dY * multiplier;
+        this.capeZ += dZ * multiplier;
     }
 
     @Override