From 3bf72a1af61ed38b3fac7cf01fcd52fcfe2fa0c0 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 21 Aug 2018 17:28:35 -0400
Subject: [PATCH] Forced hovering while on block

---
 core/src/io/anuke/mindustry/entities/Player.java    | 9 +++++----
 core/src/io/anuke/mindustry/input/DesktopInput.java | 2 --
 2 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 49a3082858..407b07c207 100644
--- a/core/src/io/anuke/mindustry/entities/Player.java
+++ b/core/src/io/anuke/mindustry/entities/Player.java
@@ -500,9 +500,11 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
             achievedFlight = false;
         }
 
+        isBoosting = Inputs.keyDown("dash") && !mech.flying;
+
         //if player is in solid block
-        if(tile != null && tile.solid() && !isFlying()){
-            damage(health + 1); //die instantly
+        if(tile != null && tile.solid()){
+            isBoosting = true;
         }
 
         float speed = isBoosting && !mech.flying ? mech.boostSpeed : mech.speed;
@@ -526,8 +528,7 @@ public class Player extends Unit implements BuilderTrait, CarryTrait, ShooterTra
             }else if(getCarry() != null){
                 dropCarry();
             }else{
-                Unit unit = Units.getClosest(team, x, y, 8f,
-                        u -> !u.isFlying() && u.getMass() <= mech.carryWeight);
+                Unit unit = Units.getClosest(team, x, y, 8f, u -> !u.isFlying() && u.getMass() <= mech.carryWeight);
 
                 if(unit != null){
                     carry(unit);
diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java
index f487325d95..91a58e86bd 100644
--- a/core/src/io/anuke/mindustry/input/DesktopInput.java
+++ b/core/src/io/anuke/mindustry/input/DesktopInput.java
@@ -168,8 +168,6 @@ public class DesktopInput extends InputHandler{
             Settings.save();
         }
 
-        player.isBoosting = Inputs.keyDown("dash");
-
         //deslect if not placing
         if(!isPlacing() && mode == placing){
             mode = none;