From 1911fced21e9890b18e0412e875ab7e4dc3c19d7 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 4 Apr 2025 12:08:34 -0400
Subject: [PATCH] Fixed #10540

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

diff --git a/core/src/mindustry/world/blocks/units/UnitFactory.java b/core/src/mindustry/world/blocks/units/UnitFactory.java
index 71353e1899..964893bbb9 100644
--- a/core/src/mindustry/world/blocks/units/UnitFactory.java
+++ b/core/src/mindustry/world/blocks/units/UnitFactory.java
@@ -55,7 +55,7 @@ public class UnitFactory extends UnitBlock{
             if(build.currentPlan == i) return;
             build.currentPlan = i < 0 || i >= plans.size ? -1 : i;
             build.progress = 0;
-            if(build.command != null && !build.unit().commands.contains(build.command)){
+            if(build.command != null && (build.unit() == null || !build.unit().commands.contains(build.command))){
                 build.command = null;
             }
         });