Try fixing target based fixtures

mchorse · Oct 30, 2016 · e10a795 · e10a795
1 parent c208a27
commit e10a795
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/src/main/java/mchorse/blockbuster/camera/fixtures/FollowFixture.java b/src/main/java/mchorse/blockbuster/camera/fixtures/FollowFixture.java
@@ -45,6 +45,13 @@ private void calculateRelativePosition()
     @Override
     public void applyFixture(float progress, float partialTicks, Position pos)
     {
+        if (this.entity == null)
+        {
+            this.tryFindingEntity();
+
+            return;
+        }
+
         float x = (float) (this.entity.lastTickPosX + (this.entity.posX - this.entity.lastTickPosX) * partialTicks);
         float y = (float) (this.entity.lastTickPosY + (this.entity.posY - this.entity.lastTickPosY) * partialTicks);
         float z = (float) (this.entity.lastTickPosZ + (this.entity.posZ - this.entity.lastTickPosZ) * partialTicks);

diff --git a/src/main/java/mchorse/blockbuster/camera/fixtures/LookFixture.java b/src/main/java/mchorse/blockbuster/camera/fixtures/LookFixture.java
@@ -17,6 +17,7 @@
 public class LookFixture extends IdleFixture
 {
     protected Entity entity;
+    protected String target;
 
     private float oldYaw = 0;
     private float oldPitch = 0;
@@ -35,6 +36,7 @@ public Entity getTarget()
     public void setTarget(String target)
     {
         this.entity = EntityUtils.entityByUUID(Minecraft.getMinecraft().theWorld, target);
+        this.target = target;
     }
 
     @Override
@@ -52,6 +54,7 @@ public void edit(String[] args, EntityPlayer player) throws CommandException
         if ((this.entity == null || this.entity.isDead) && target != null)
         {
             this.entity = target;
+            this.target = target.getUniqueID().toString();
         }
     }
 
@@ -61,6 +64,13 @@ public void edit(String[] args, EntityPlayer player) throws CommandException
     @Override
     public void applyFixture(float progress, float partialTicks, Position pos)
     {
+        if (this.entity == null)
+        {
+            this.tryFindingEntity();
+
+            return;
+        }
+
         double x = (this.entity.lastTickPosX + (this.entity.posX - this.entity.lastTickPosX) * partialTicks);
         double y = (this.entity.lastTickPosY + (this.entity.posY - this.entity.lastTickPosY) * partialTicks);
         double z = (this.entity.lastTickPosZ + (this.entity.posZ - this.entity.lastTickPosZ) * partialTicks);
@@ -94,6 +104,11 @@ public void applyFixture(float progress, float partialTicks, Position pos)
         this.oldProgress = progress;
     }
 
+    protected void tryFindingEntity()
+    {
+        this.entity = EntityUtils.entityByUUID(Minecraft.getMinecraft().theWorld, this.target);
+    }
+
     /**
      * Special interpolation method for interpolating yaw. The problem with yaw,
      * is that it may go in the "wrong" direction when having, for example,

diff --git a/src/main/java/mchorse/blockbuster/recording/data/Frame.java b/src/main/java/mchorse/blockbuster/recording/data/Frame.java
@@ -83,7 +83,7 @@ public void applyOnActor(EntityActor actor, boolean force)
         actor.prevRotationPitch = actor.rotationPitch;
 
         /* Inject frame's values into actor */
-        if (!isRemote)
+        if (!isRemote || force)
         {
             actor.posX = this.x;
             actor.posY = this.y;