From ce4031af74fc32976f79164158246ff8295392b4 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 2 Oct 2018 21:44:32 -0400
Subject: [PATCH] Additional bugfixes

---
 build.gradle                                               | 2 +-
 core/src/io/anuke/mindustry/content/UnitTypes.java         | 7 ++++---
 core/src/io/anuke/mindustry/entities/units/GroundUnit.java | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 27bf254542..29d3536ec7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -27,7 +27,7 @@ allprojects {
         appName = 'Mindustry'
         gdxVersion = '1.9.8'
         roboVMVersion = '2.3.0'
-        uCoreVersion = '8b72f5b0fadc4a2133337d9db4651ac4794581d9'
+        uCoreVersion = 'ad9936bf6ebba8cd5b3a654b8973408f7101dc7d'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
diff --git a/core/src/io/anuke/mindustry/content/UnitTypes.java b/core/src/io/anuke/mindustry/content/UnitTypes.java
index 52bc0ebc84..9b22c378cd 100644
--- a/core/src/io/anuke/mindustry/content/UnitTypes.java
+++ b/core/src/io/anuke/mindustry/content/UnitTypes.java
@@ -50,6 +50,7 @@ public class UnitTypes implements ContentList{
             maxVelocity = 1.1f;
             speed = 0.2f;
             drag = 0.4f;
+            hitsize = 8f;
             mass = 1.75f;
             range = 40f;
             weapon = Weapons.chainBlaster;
@@ -60,9 +61,9 @@ public class UnitTypes implements ContentList{
             maxVelocity = 0.8f;
             speed = 0.18f;
             drag = 0.4f;
-            mass = 3f;
+            mass = 3.5f;
             range = 10f;
-            hitsize = 8f;
+            hitsize = 9f;
             rotatespeed = 0.1f;
             weapon = Weapons.flamethrower;
             health = 440;
@@ -72,7 +73,7 @@ public class UnitTypes implements ContentList{
             maxVelocity = 0.8f;
             speed = 0.15f;
             drag = 0.4f;
-            mass = 4.5f;
+            mass = 5f;
             hitsize = 10f;
             range = 10f;
             rotatespeed = 0.06f;
diff --git a/core/src/io/anuke/mindustry/entities/units/GroundUnit.java b/core/src/io/anuke/mindustry/entities/units/GroundUnit.java
index b0d5aab067..19451d739d 100644
--- a/core/src/io/anuke/mindustry/entities/units/GroundUnit.java
+++ b/core/src/io/anuke/mindustry/entities/units/GroundUnit.java
@@ -119,7 +119,7 @@ public abstract class GroundUnit extends BaseUnit{
     public void update(){
         super.update();
 
-        stuckTime = !getVelocity().isZero(0.0001f) ? 0f : stuckTime + Timers.delta();
+        stuckTime = !vec.set(x, y).sub(lastPosition()).isZero(0.0001f) ? 0f : stuckTime + Timers.delta();
 
         if(!velocity.isZero(0.0001f) && (Units.invalidateTarget(target, this) || (distanceTo(target) > getWeapon().getAmmo().getRange()))){
             rotation = Mathf.slerpDelta(rotation, velocity.angle(), type.rotatespeed);