From f1d09053f32d5b157403f529d99ddcad3d9d62e7 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Mon, 28 Sep 2020 10:26:08 -0400
Subject: [PATCH] Fixed #2755 / Fixed #2753

---
 core/src/mindustry/ai/types/GroundAI.java      | 2 +-
 core/src/mindustry/entities/comp/UnitComp.java | 2 +-
 core/src/mindustry/net/CrashSender.java        | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/src/mindustry/ai/types/GroundAI.java b/core/src/mindustry/ai/types/GroundAI.java
index 20f10c9cb0..bd6b13a25c 100644
--- a/core/src/mindustry/ai/types/GroundAI.java
+++ b/core/src/mindustry/ai/types/GroundAI.java
@@ -45,7 +45,7 @@ public class GroundAI extends AIController{
             }
         }
 
-        if(unit.type().canBoost && unit.canPassOn()){
+        if(unit.type().canBoost && unit.tileOn() != null && !unit.tileOn().solid()){
             unit.elevation = Mathf.approachDelta(unit.elevation, 0f, 0.08f);
         }
 
diff --git a/core/src/mindustry/entities/comp/UnitComp.java b/core/src/mindustry/entities/comp/UnitComp.java
index 695703dd2f..d2618e7e83 100644
--- a/core/src/mindustry/entities/comp/UnitComp.java
+++ b/core/src/mindustry/entities/comp/UnitComp.java
@@ -417,7 +417,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         dead = true;
 
         //don't waste time when the unit is already on the ground, just destroy it
-        if(isGrounded()){
+        if(!type.flying){
             destroy();
         }
     }
diff --git a/core/src/mindustry/net/CrashSender.java b/core/src/mindustry/net/CrashSender.java
index c375827848..9a98d87555 100644
--- a/core/src/mindustry/net/CrashSender.java
+++ b/core/src/mindustry/net/CrashSender.java
@@ -25,15 +25,15 @@ import static mindustry.Vars.net;
 public class CrashSender{
 
     public static String createReport(String error){
-        String report = "Oh no, Mindustry crashed!\n";
-        if(mods.list().size == 0){
-            report += "Please report this at " + Vars.reportIssueURL + "\n\n";
+        String report = "Mindustry has crashed. How unforunate.\n";
+        if(mods.list().size == 0 && Version.build != -1){
+            report += "Report this at " + Vars.reportIssueURL + "\n\n";
         }
         return report + "Version: " + Version.combined() + (Vars.headless ? " (Server)" : "") + "\n"
             + "OS: " + System.getProperty("os.name") + " x" + (OS.is64Bit ? "64" : "32") + "\n"
             + "Java Version: " + System.getProperty("java.version") + "\n"
             + "Java Architecture: " + System.getProperty("sun.arch.data.model") + "\n"
-            + mods.list().size + " Mods: " + (mods.list().isEmpty() ? "none" : mods.list().toString(", ", mod -> mod.name + ":" + mod.meta.version))
+            + mods.list().size + " Mods" + (mods.list().isEmpty() ? "" : ": " + mods.list().toString(", ", mod -> mod.name + ":" + mod.meta.version))
             + "\n\n" + error;
     }