Fixed ghost units appearing in certain situations

core/src/mindustry/entities/Units.java

@@ -19,8 +19,17 @@ public class Units{
     private static boolean boolResult;
 
     @Remote(called = Loc.server)
-    public static void unitDeath(Unit unit){
-        unit.killed();
+    public static void unitDeath(int uid){
+        Unit unit = Groups.unit.getByID(uid);
+
+        //if there's no unit don't add it later and get it stuck as a ghost
+        if(netClient != null){
+            netClient.addRemovedEntity(uid);
+        }
+
+        if(unit != null){
+            unit.killed();
+        }
     }
 
     @Remote(called = Loc.server)

core/src/mindustry/entities/comp/UnitComp.java

@@ -31,6 +31,7 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
     @Import float x, y, rotation, elevation, maxHealth, drag, armor, hitSize, health;
     @Import boolean dead;
     @Import Team team;
+    @Import int id;
 
     private UnitController controller;
     private UnitType type;
@@ -389,6 +390,6 @@ abstract class UnitComp implements Healthc, Physicsc, Hitboxc, Statusc, Teamc, I
         if(dead || net.client()) return;
 
         //deaths are synced; this calls killed()
-        Call.unitDeath(base());
+        Call.unitDeath(id);
     }
 }