From d948607039ba5127f8e92d4fdcde8eb35f6cea52 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 25 Jun 2018 18:33:40 -0400
Subject: [PATCH] Fixed dashing not syncing, position being verified on client
 hosting

---
 core/src/io/anuke/mindustry/core/NetServer.java  | 2 +-
 core/src/io/anuke/mindustry/entities/Player.java | 6 +++---
 core/src/io/anuke/mindustry/io/TypeIO.java       | 6 ++----
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/core/src/io/anuke/mindustry/core/NetServer.java b/core/src/io/anuke/mindustry/core/NetServer.java
index 8c5889fe13..ce9a5b7abf 100644
--- a/core/src/io/anuke/mindustry/core/NetServer.java
+++ b/core/src/io/anuke/mindustry/core/NetServer.java
@@ -164,7 +164,7 @@ public class NetServer extends Module{
             NetConnection connection = Net.getConnection(id);
             if(player == null || connection == null || packet.snapid < connection.lastRecievedSnapshot) return;
 
-            boolean verifyPosition = !player.isDead() && !debug && !headless;
+            boolean verifyPosition = !player.isDead() && !debug && headless;
 
             if(connection.lastRecievedTime == 0) connection.lastRecievedTime = TimeUtils.millis() - 16;
 
diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java
index d7135ec46e..574bff7127 100644
--- a/core/src/io/anuke/mindustry/entities/Player.java
+++ b/core/src/io/anuke/mindustry/entities/Player.java
@@ -271,7 +271,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait {
 			baseRotation = Mathf.slerpDelta(baseRotation, movement.angle(), 0.13f);
 		}
 
-		boostHeat = Mathf.lerpDelta(boostHeat, isBoosting && !movement.isZero() && moved ? 1f : 0f, 0.08f);
+		boostHeat = Mathf.lerpDelta(boostHeat, isBoosting && ((!movement.isZero() && moved) || !isLocal) ? 1f : 0f, 0.08f);
 
         boolean snap = snapCamera && isLocal;
 
@@ -717,7 +717,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait {
 		color.set(buffer.readInt());
 		dead = buffer.readBoolean();
 		mech = Upgrade.getByID(buffer.readByte());
-		boolean dashing = buffer.readBoolean();
+		boolean boosting = buffer.readBoolean();
 		int mine = buffer.readInt();
 		interpolator.read(lastx, lasty, x, y, time, rotation);
 		rotation = lastrot;
@@ -727,7 +727,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait {
 			y = lasty;
 		}else{
 			mining = world.tile(mine);
-			isBoosting = dashing;
+			isBoosting = boosting;
 		}
 	}
 
diff --git a/core/src/io/anuke/mindustry/io/TypeIO.java b/core/src/io/anuke/mindustry/io/TypeIO.java
index 865792c338..cca6710aa5 100644
--- a/core/src/io/anuke/mindustry/io/TypeIO.java
+++ b/core/src/io/anuke/mindustry/io/TypeIO.java
@@ -24,9 +24,7 @@ import io.anuke.ucore.entities.Entities;
 
 import java.nio.ByteBuffer;
 
-import static io.anuke.mindustry.Vars.bulletGroup;
-import static io.anuke.mindustry.Vars.playerGroup;
-import static io.anuke.mindustry.Vars.world;
+import static io.anuke.mindustry.Vars.*;
 
 /**Class for specifying read/write methods for code generation.*/
 public class TypeIO {
@@ -67,7 +65,7 @@ public class TypeIO {
     @ReadClass(Bullet.class)
     public static Bullet readBullet(ByteBuffer buffer){
         int id = buffer.getInt();
-        return (Bullet)bulletGroup.getByID(id);
+        return bulletGroup.getByID(id);
     }
 
     @WriteClass(CarriableTrait.class)