From 36afd9f140c44a5546a895a74891a1a4782d281d Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 8 Feb 2018 09:24:25 -0500
Subject: [PATCH] Fixed player rotation not being sent on Android

---
 core/src/io/anuke/mindustry/entities/Player.java      | 7 +++----
 core/src/io/anuke/mindustry/entities/SyncEntity.java  | 2 +-
 core/src/io/anuke/mindustry/input/GestureHandler.java | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java
index d0332bb426..05c09c37b3 100644
--- a/core/src/io/anuke/mindustry/entities/Player.java
+++ b/core/src/io/anuke/mindustry/entities/Player.java
@@ -105,10 +105,6 @@ public class Player extends SyncEntity{
 	
 	@Override
 	public void drawSmooth(){
-        if(isAndroid && isLocal){
-            angle = Mathf.lerpAngDelta(angle, targetAngle, 0.2f);
-        }
-
 		if((debug && (!showPlayer || !showUI)) || (isAndroid && isLocal) || (dead && !isLocal)) return;
         boolean snap = snapCamera && Settings.getBool("smoothcam") && Settings.getBool("pixelate") && isLocal;
 
@@ -145,6 +141,9 @@ public class Player extends SyncEntity{
 	@Override
 	public void update(){
 		if(!isLocal || isAndroid){
+			if(isAndroid && isLocal){
+				angle = Mathf.lerpAngDelta(angle, targetAngle, 0.2f);
+			}
 			if(!isLocal) interpolate();
 			return;
 		}
diff --git a/core/src/io/anuke/mindustry/entities/SyncEntity.java b/core/src/io/anuke/mindustry/entities/SyncEntity.java
index 7d29b4e9f0..b61631c9f8 100644
--- a/core/src/io/anuke/mindustry/entities/SyncEntity.java
+++ b/core/src/io/anuke/mindustry/entities/SyncEntity.java
@@ -49,7 +49,7 @@ public abstract class SyncEntity extends DestructibleEntity{
 
     @Override
     public final void draw(){
-        float x = this.x, y = this.y, angle = this.angle;
+        final float x = this.x, y = this.y, angle = this.angle;
 
         //interpolates data at low tick speeds.
         if(isSmoothing()){
diff --git a/core/src/io/anuke/mindustry/input/GestureHandler.java b/core/src/io/anuke/mindustry/input/GestureHandler.java
index 0b67076a93..558f5afd93 100644
--- a/core/src/io/anuke/mindustry/input/GestureHandler.java
+++ b/core/src/io/anuke/mindustry/input/GestureHandler.java
@@ -52,7 +52,7 @@ public class GestureHandler extends GestureAdapter{
 			float dx = deltaX*Core.camera.zoom/Core.cameraScale, dy = deltaY*Core.camera.zoom/Core.cameraScale;
 			player.x -= dx;
 			player.y += dy;
-			player.targetAngle = Mathf.atan2(dx, -dy);
+			player.targetAngle = Mathf.atan2(dx, -dy) + 180f;
 		}else if(control.input().placeMode.lockCamera && (control.input().placeMode.pan && control.input().recipe != null)){
 			input.mousex += deltaX;
 			input.mousey += deltaY;