From 2b6856634c3a82fa5d82ff82e7cadbc4579f2c79 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 25 Aug 2021 13:22:19 -0400
Subject: [PATCH] Fixed #5864

---
 core/src/mindustry/world/blocks/payloads/PayloadBlock.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/world/blocks/payloads/PayloadBlock.java b/core/src/mindustry/world/blocks/payloads/PayloadBlock.java
index 86023894e3..ea4de86c26 100644
--- a/core/src/mindustry/world/blocks/payloads/PayloadBlock.java
+++ b/core/src/mindustry/world/blocks/payloads/PayloadBlock.java
@@ -79,7 +79,7 @@ public class PayloadBlock extends Block{
 
         @Override
         public boolean canControlSelect(Player player){
-            return !player.unit().spawnedByCore && this.payload == null && acceptUnitPayload(player.unit()) && player.tileOn().build == this;
+            return !player.unit().spawnedByCore && this.payload == null && acceptUnitPayload(player.unit()) && player.tileOn() != null && player.tileOn().build == this;
         }
 
         @Override