From ed276ac79e1515779f4cae4ff70d84a02c5aecb3 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 30 Mar 2018 19:18:33 -0400
Subject: [PATCH] Fixed random collision deaths

---
 build.gradle                                     |  2 +-
 core/assets/version.properties                   |  4 ++--
 core/src/io/anuke/mindustry/entities/Player.java | 14 +++-----------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/build.gradle b/build.gradle
index a6a170316c..ccf5fef38e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,7 +25,7 @@ allprojects {
         appName = 'Mindustry'
         gdxVersion = '1.9.8'
         aiVersion = '1.8.1'
-        uCoreVersion = '1d4cc71'
+        uCoreVersion = 'd7c7094'
 
         getVersionString = {
             String buildVersion = getBuildVersion()
diff --git a/core/assets/version.properties b/core/assets/version.properties
index c6803a8f40..836de62cd0 100644
--- a/core/assets/version.properties
+++ b/core/assets/version.properties
@@ -1,7 +1,7 @@
 #Autogenerated file. Do not modify.
-#Fri Mar 30 18:03:34 EDT 2018
+#Fri Mar 30 19:18:12 EDT 2018
 version=release
-androidBuildCode=478
+androidBuildCode=482
 name=Mindustry
 code=3.5
 build=custom build
diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java
index 0a53034999..42f4367697 100644
--- a/core/src/io/anuke/mindustry/entities/Player.java
+++ b/core/src/io/anuke/mindustry/entities/Player.java
@@ -42,7 +42,6 @@ public class Player extends SyncEntity{
 	public Mech mech = Mech.standard;
 
 	public float targetAngle = 0f;
-	public float stucktime = 0f;
 	public boolean dashing = false;
 
 	public int clientid = -1;
@@ -54,7 +53,7 @@ public class Player extends SyncEntity{
 	
 	public Player(){
 		hitbox.setSize(5);
-		hitboxTile.setSize(5f);
+		hitboxTile.setSize(4f);
 		
 		maxhealth = 200;
 		heal();
@@ -161,15 +160,8 @@ public class Player extends SyncEntity{
 		Tile tile = world.tileWorld(x, y);
 
 		//if player is in solid block
-		if(tile != null && ((tile.floor().liquid && tile.block() == Blocks.air) || tile.solid())){
-			stucktime += Timers.delta();
-		}else{
-			stucktime = 0f;
-		}
-
-		if(stucktime > 15f){
-			damage(health+1); //die instantly
-			stucktime = 0f;
+		if(tile != null && ((tile.floor().liquid && tile.block() == Blocks.air) || tile.solid())) {
+			damage(health + 1); //die instantly
 		}
 
 		if(ui.chatfrag.chatOpen()) return;