Merge branch '1.15.2' into 1.16.x

Thuts-Mods · Dec 4, 2020 · 4d08615 · 4d08615
2 parents 5964023 + d70770d
commit 4d08615
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/main/java/thut/tech/common/blocks/lift/ControllerTile.java b/src/main/java/thut/tech/common/blocks/lift/ControllerTile.java
@@ -341,11 +341,8 @@ public void tick()
         if (this.here == null) this.here = Vector3.getNewVector();
         this.here.set(this);
         EntityLift lift = this.getLift();
-        // if (this.liftID != null)
-        // {
-        // System.out.println(lift + " " + this.liftID);
-        // System.out.println(this.floor);
-        // }
+
+        // Processing beyond here is only server side!
         if (this.getWorld().isRemote) return;
         if (this.world instanceof IBlockEntityWorld) return;
 
@@ -459,6 +456,14 @@ else if (this.lift == null)
         {
             this.lift = EntityLift.getLiftFromUUID(this.liftID, this.getWorld());
 
+            // Client side process this differently for when the tile entity
+            // ticks before the lift actually loads in.
+            if (this.getWorld().isRemote)
+            {
+                if (this.lift != null) this.setLift(this.lift);
+                return this.lift;
+            }
+
             if (this.lift == null) this.setLift(null);
             else
             {