From ba91fb8eb7bfd0f88a3ddbd104dc033eca17f973 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 17 Oct 2021 15:14:19 -0400
Subject: [PATCH] Bugfixes

---
 .../mindustry/entities/comp/BuildingComp.java | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java
index 79b6ee9650..e913895b98 100644
--- a/core/src/mindustry/entities/comp/BuildingComp.java
+++ b/core/src/mindustry/entities/comp/BuildingComp.java
@@ -413,19 +413,18 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
 
     }
 
-    public void handleUnitPayload(Unit player, Cons<Payload> grabber){
-        Fx.spawn.at(player);
+    public void handleUnitPayload(Unit unit, Cons<Payload> grabber){
+        Fx.spawn.at(unit);
 
-        if(player.isPlayer()){
-            player.getPlayer().clearUnit();
+        if(unit.isPlayer()){
+            unit.getPlayer().clearUnit();
         }
 
-        player.remove();
-        grabber.get(new UnitPayload(player));
-        Fx.unitDrop.at(player);
-        if(Vars.net.client()){
-            Vars.netClient.clearRemovedEntity(player.id);
-        }
+        unit.remove();
+        //needs new ID as it is now a payload
+        unit.id = EntityGroup.nextId();
+        grabber.get(new UnitPayload(unit));
+        Fx.unitDrop.at(unit);
     }
 
     public boolean canUnload(){