From 26045904f4773de08ae046176295f9b8c818564a Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 29 Oct 2021 11:29:38 -0400
Subject: [PATCH] Fixed #6259

---
 core/src/mindustry/entities/comp/PayloadComp.java          | 1 -
 core/src/mindustry/world/blocks/payloads/BuildPayload.java | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/mindustry/entities/comp/PayloadComp.java b/core/src/mindustry/entities/comp/PayloadComp.java
index 34b3a76bec..045ae581d0 100644
--- a/core/src/mindustry/entities/comp/PayloadComp.java
+++ b/core/src/mindustry/entities/comp/PayloadComp.java
@@ -93,7 +93,6 @@ abstract class PayloadComp implements Posc, Rotc, Hitboxc, Unitc{
     void pickup(Building tile){
         tile.pickedUp();
         tile.tile.remove();
-        tile.tile = Vars.emptyTile;
         addPayload(new BuildPayload(tile));
         Fx.unitPickup.at(tile);
         Events.fire(new PickupEvent(self(), tile));
diff --git a/core/src/mindustry/world/blocks/payloads/BuildPayload.java b/core/src/mindustry/world/blocks/payloads/BuildPayload.java
index 25b6869865..290c3856af 100644
--- a/core/src/mindustry/world/blocks/payloads/BuildPayload.java
+++ b/core/src/mindustry/world/blocks/payloads/BuildPayload.java
@@ -40,7 +40,7 @@ public class BuildPayload implements Payload{
     public void update(boolean inUnit){
         if(inUnit && !build.block.updateInUnits) return;
 
-        if(build.tile == null) build.tile = emptyTile;
+        build.tile = emptyTile;
         build.update();
     }
 
@@ -92,6 +92,7 @@ public class BuildPayload implements Payload{
         drawShadow(1f);
         float prevZ = Draw.z();
         Draw.zTransform(z -> 0.0011f + Mathf.clamp(z, prevZ - 0.001f, prevZ + 0.9f));
+        build.tile = emptyTile;
         build.payloadDraw();
         Draw.zTransform();
     }