From 7639f8102f425579521de1dcad2083f49508cc58 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 9 Oct 2020 15:34:25 -0400
Subject: [PATCH] Bugfixes

---
 core/src/mindustry/logic/LExecutor.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/logic/LExecutor.java b/core/src/mindustry/logic/LExecutor.java
index f36a5d6a16..93c5263a9b 100644
--- a/core/src/mindustry/logic/LExecutor.java
+++ b/core/src/mindustry/logic/LExecutor.java
@@ -390,7 +390,9 @@ public class LExecutor{
                             if(exec.bool(p1)){
                                 Unit result = Units.closest(unit.team, unit.x, unit.y, unit.type().hitSize * 2f, u -> u.isAI() && u.isGrounded() && pay.canPickup(u) && u.within(unit, u.hitSize + unit.hitSize * 1.2f));
 
-                                Call.pickedUnitPayload(unit, result);
+                                if(result != null){
+                                    Call.pickedUnitPayload(unit, result);
+                                }
                             }else{ //buildings
                                 Building tile = world.buildWorld(unit.x, unit.y);