From 2ba38c2ee38e8e6a4da9738c79b02f71070eab3f Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sat, 3 Feb 2018 22:59:46 -0500
Subject: [PATCH] Fixed glitchy interpolation and block bars

---
 core/src/io/anuke/mindustry/core/Renderer.java          | 2 +-
 core/src/io/anuke/mindustry/entities/Player.java        | 2 +-
 core/src/io/anuke/mindustry/entities/enemies/Enemy.java | 2 +-
 core/src/io/anuke/mindustry/io/versions/Save15.java     | 3 ---
 4 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java
index 8649d513d0..ef7cc58dce 100644
--- a/core/src/io/anuke/mindustry/core/Renderer.java
+++ b/core/src/io/anuke/mindustry/core/Renderer.java
@@ -411,7 +411,7 @@ public class Renderer extends RendererModule{
 
 				if(target.entity != null) {
 					int bot = 0, top = 0;
-					for (BlockBar bar : tile.block().bars) {
+					for (BlockBar bar : target.block().bars) {
 						float offset = Mathf.sign(bar.top) * (target.block().height / 2f * tilesize + 3f + 4f * ((bar.top ? top : bot))) +
 								(bar.top ? -1f : 0f);
 
diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java
index 5c7a46b087..0b474da29f 100644
--- a/core/src/io/anuke/mindustry/entities/Player.java
+++ b/core/src/io/anuke/mindustry/entities/Player.java
@@ -277,7 +277,7 @@ public class Player extends SyncEntity{
 		interpolator.time = 0f;
 		interpolator.last.set(this.x, this.y);
 		interpolator.target.set(x, y);
-		interpolator.spacing = Math.max(((TimeUtils.timeSinceMillis(time) / 1000f) * 60f), 1f);
+		interpolator.spacing = Math.max(((TimeUtils.timeSinceMillis(time) / 1000f) * 60f), 4f);
 	}
 
 	@Override
diff --git a/core/src/io/anuke/mindustry/entities/enemies/Enemy.java b/core/src/io/anuke/mindustry/entities/enemies/Enemy.java
index 04a2f6dd4c..b19162fd28 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/Enemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/Enemy.java
@@ -142,7 +142,7 @@ public class Enemy extends SyncEntity {
 		interpolator.time = 0f;
 		interpolator.last.set(this.x, this.y);
 		interpolator.target.set(x, y);
-		interpolator.spacing = Math.max(((TimeUtils.timeSinceMillis(time) / 1000f) * 60f), 1f);
+		interpolator.spacing = Math.max(((TimeUtils.timeSinceMillis(time) / 1000f) * 60f), 4f);
 	}
 
 	@Override
diff --git a/core/src/io/anuke/mindustry/io/versions/Save15.java b/core/src/io/anuke/mindustry/io/versions/Save15.java
index 733964efa3..749035c739 100644
--- a/core/src/io/anuke/mindustry/io/versions/Save15.java
+++ b/core/src/io/anuke/mindustry/io/versions/Save15.java
@@ -19,7 +19,6 @@ import io.anuke.mindustry.world.blocks.Blocks;
 import io.anuke.mindustry.world.blocks.types.BlockPart;
 import io.anuke.mindustry.world.blocks.types.Rock;
 import io.anuke.ucore.core.Core;
-import io.anuke.ucore.util.Log;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
@@ -191,8 +190,6 @@ public class Save15 extends SaveFileVersion {
 
             Tile tile = world.tile(pos % world.width(), pos / world.width());
 
-            Log.info("Load tile {0} {1}", pos, blockid > Block.getAllBlocks().size || blockid < 0 ? null : Block.getByID(blockid));
-
             tile.setBlock(map.get(blockid));
 
             if(blockid == Blocks.blockpart.id){