From f4a838df98662491eb3d3fb787c5cf0a4656f82c Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 5 Aug 2020 09:59:50 -0400
Subject: [PATCH] Bugfixes

---
 .../src/mindustry/entities/comp/ElevationMoveComp.java | 10 ----------
 core/src/mindustry/entities/comp/UnitComp.java         |  8 ++++++++
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/core/src/mindustry/entities/comp/ElevationMoveComp.java b/core/src/mindustry/entities/comp/ElevationMoveComp.java
index fed4885d37..07eae31a6c 100644
--- a/core/src/mindustry/entities/comp/ElevationMoveComp.java
+++ b/core/src/mindustry/entities/comp/ElevationMoveComp.java
@@ -2,7 +2,6 @@ package mindustry.entities.comp;
 
 import mindustry.annotations.Annotations.*;
 import mindustry.gen.*;
-import mindustry.world.*;
 
 import static mindustry.Vars.*;
 
@@ -21,13 +20,4 @@ abstract class ElevationMoveComp implements Velc, Posc, Flyingc, Hitboxc{
         }
     }
 
-    @Override
-    public void update(){
-        Tile tile = tileOn();
-
-        if(!net.client() && tile != null && tile.solid() && !isFlying()){
-            kill();
-        }
-    }
-
 }
diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java
index a770a2e762..2ee1699194 100644
--- a/core/src/mindustry/entities/comp/UnitComp.java
+++ b/core/src/mindustry/entities/comp/UnitComp.java
@@ -252,6 +252,14 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
             if(floor.damageTaken > 0f){
                 damageContinuous(floor.damageTaken);
             }
+
+            if(!net.client() && tile.solid()){
+                if(type.canBoost){
+                    elevation = 1f;
+                }else{
+                    kill();
+                }
+            }
         }
 
         //AI only updates on the server