From 1bdd352c8774aaa275c2993ef2be58c2ad0a7bc8 Mon Sep 17 00:00:00 2001
From: lL1l1 <82986251+lL1l1@users.noreply.github.com>
Date: Mon, 16 Jun 2025 13:17:15 -0700
Subject: [PATCH 01/17] Add dummy unit oncreate to zxa0003 script

Fixes adjacency error
---
 units/ZXA0003/ZXA0003_script.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/units/ZXA0003/ZXA0003_script.lua b/units/ZXA0003/ZXA0003_script.lua
index 8f0583c7b04..e195f97b36f 100644
--- a/units/ZXA0003/ZXA0003_script.lua
+++ b/units/ZXA0003/ZXA0003_script.lua
@@ -26,6 +26,8 @@ local DummyUnit = import('/lua/sim/unit.lua').DummyUnit
 ZXA0003 = ClassUnit(DummyUnit) {
 
     OnCreate = function (self)
+        DummyUnit.OnCreate(self)
+
         self:HideBone(0, true)
         -- do not allow the unit to be killed or to take damage
         self.CanTakeDamage = false

From f6c04c0737c46380176db55e8aa5f4a95de5103e Mon Sep 17 00:00:00 2001
From: lL1l1 <82986251+lL1l1@users.noreply.github.com>
Date: Mon, 16 Jun 2025 13:17:39 -0700
Subject: [PATCH 02/17] Ignore dummy units in OnAdjacentTo

---
 lua/sim/units/StructureUnit.lua | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lua/sim/units/StructureUnit.lua b/lua/sim/units/StructureUnit.lua
index 2ff47a08df7..3f43c6732af 100644
--- a/lua/sim/units/StructureUnit.lua
+++ b/lua/sim/units/StructureUnit.lua
@@ -774,7 +774,9 @@ StructureUnit = ClassUnit(Unit, BlinkingLightsUnitComponent) {
     OnAdjacentTo = function(self, adjacentUnit, triggerUnit)
 
         -- make sure we're both finished building
-        if self:IsBeingBuilt() or adjacentUnit:IsBeingBuilt() then
+        if self:IsBeingBuilt() or adjacentUnit:IsBeingBuilt()
+            or adjacentUnit.Blueprint.CategoriesHash["DUMMYUNIT"]
+        then
             return
         end
 
@@ -816,7 +818,9 @@ StructureUnit = ClassUnit(Unit, BlinkingLightsUnitComponent) {
     OnNotAdjacentTo = function(self, adjacentUnit)
 
         -- make sure we're both finished building
-        if self:IsBeingBuilt() or adjacentUnit:IsBeingBuilt() then
+        if self:IsBeingBuilt() or adjacentUnit:IsBeingBuilt()
+            or adjacentUnit.Blueprint.CategoriesHash["DUMMYUNIT"]
+        then
             return
         end
 

From f5c8194ca9fcebc08f715a39c46cf84f81b9783c Mon Sep 17 00:00:00 2001
From: lL1l1 <82986251+lL1l1@users.noreply.github.com>
Date: Mon, 16 Jun 2025 13:23:00 -0700
Subject: [PATCH 03/17] debug code

---
 lua/sim/units/StructureUnit.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lua/sim/units/StructureUnit.lua b/lua/sim/units/StructureUnit.lua
index 3f43c6732af..b405552975d 100644
--- a/lua/sim/units/StructureUnit.lua
+++ b/lua/sim/units/StructureUnit.lua
@@ -777,6 +777,7 @@ StructureUnit = ClassUnit(Unit, BlinkingLightsUnitComponent) {
         if self:IsBeingBuilt() or adjacentUnit:IsBeingBuilt()
             or adjacentUnit.Blueprint.CategoriesHash["DUMMYUNIT"]
         then
+            LOG('OnAdjacentTo return')
             return
         end
 
@@ -821,6 +822,7 @@ StructureUnit = ClassUnit(Unit, BlinkingLightsUnitComponent) {
         if self:IsBeingBuilt() or adjacentUnit:IsBeingBuilt()
             or adjacentUnit.Blueprint.CategoriesHash["DUMMYUNIT"]
         then
+            LOG('OnNotAdjacentTo return')
             return
         end
 

From 1afed8a147bcfcdd02afa98a6c927b80db7952bf Mon Sep 17 00:00:00 2001
From: lL1l1 <82986251+lL1l1@users.noreply.github.com>
Date: Mon, 16 Jun 2025 13:26:04 -0700
Subject: [PATCH 04/17] Revert "debug code"

This reverts commit ff70d4f53e341dc7bd5c6fccee8de1d915f24dec.
---
 lua/sim/units/StructureUnit.lua | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lua/sim/units/StructureUnit.lua b/lua/sim/units/StructureUnit.lua
index b405552975d..3f43c6732af 100644
--- a/lua/sim/units/StructureUnit.lua
+++ b/lua/sim/units/StructureUnit.lua
@@ -777,7 +777,6 @@ StructureUnit = ClassUnit(Unit, BlinkingLightsUnitComponent) {
         if self:IsBeingBuilt() or adjacentUnit:IsBeingBuilt()
             or adjacentUnit.Blueprint.CategoriesHash["DUMMYUNIT"]
         then
-            LOG('OnAdjacentTo return')
             return
         end
 
@@ -822,7 +821,6 @@ StructureUnit = ClassUnit(Unit, BlinkingLightsUnitComponent) {
         if self:IsBeingBuilt() or adjacentUnit:IsBeingBuilt()
             or adjacentUnit.Blueprint.CategoriesHash["DUMMYUNIT"]
         then
-            LOG('OnNotAdjacentTo return')
             return
         end
 

From 60400b3b5544bbff72717ed26a8790332498f608 Mon Sep 17 00:00:00 2001
From: lL1l1 <82986251+lL1l1@users.noreply.github.com>
Date: Mon, 16 Jun 2025 13:27:55 -0700
Subject: [PATCH 05/17] Create fix.6863md

---
 changelog/snippets/fix.6863md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 changelog/snippets/fix.6863md

diff --git a/changelog/snippets/fix.6863md b/changelog/snippets/fix.6863md
new file mode 100644
index 00000000000..9b439084988
--- /dev/null
+++ b/changelog/snippets/fix.6863md
@@ -0,0 +1 @@
+- (#6863) Fix `OnAdjacentTo` error caused by dummy units attached to external factories and UEF engineering drones.

From 8a622540f4dd641f278d2e5a17792f5e2083bd5f Mon Sep 17 00:00:00 2001
From: lL1l1 <82986251+lL1l1@users.noreply.github.com>
Date: Sun, 29 Jun 2025 12:49:58 -0700
Subject: [PATCH 06/17] Reapply "debug code"

This reverts commit f48ecd0a24d71c52f6d67429a87dd042b18d74e2.
---
 lua/sim/units/StructureUnit.lua | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lua/sim/units/StructureUnit.lua b/lua/sim/units/StructureUnit.lua
index 3f43c6732af..b405552975d 100644
--- a/lua/sim/units/StructureUnit.lua
+++ b/lua/sim/units/StructureUnit.lua
@@ -777,6 +777,7 @@ StructureUnit = ClassUnit(Unit, BlinkingLightsUnitComponent) {
         if self:IsBeingBuilt() or adjacentUnit:IsBeingBuilt()
             or adjacentUnit.Blueprint.CategoriesHash["DUMMYUNIT"]
         then
+            LOG('OnAdjacentTo return')
             return
         end
 
@@ -821,6 +822,7 @@ StructureUnit = ClassUnit(Unit, BlinkingLightsUnitComponent) {
         if self:IsBeingBuilt() or adjacentUnit:IsBeingBuilt()
             or adjacentUnit.Blueprint.CategoriesHash["DUMMYUNIT"]
         then
+            LOG('OnNotAdjacentTo return')
             return
         end
 

From 5136f8f7f2173b5b3a38d0d4141d886d70991955 Mon Sep 17 00:00:00 2001
From: lL1l1 <82986251+lL1l1@users.noreply.github.com>
Date: Sun, 29 Jun 2025 12:51:05 -0700
Subject: [PATCH 07/17] Revert changes

---
 lua/sim/units/StructureUnit.lua  | 8 ++------
 units/ZXA0003/ZXA0003_script.lua | 2 --
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/lua/sim/units/StructureUnit.lua b/lua/sim/units/StructureUnit.lua
index b405552975d..125fde5b8bc 100644
--- a/lua/sim/units/StructureUnit.lua
+++ b/lua/sim/units/StructureUnit.lua
@@ -774,9 +774,7 @@ StructureUnit = ClassUnit(Unit, BlinkingLightsUnitComponent) {
     OnAdjacentTo = function(self, adjacentUnit, triggerUnit)
 
         -- make sure we're both finished building
-        if self:IsBeingBuilt() or adjacentUnit:IsBeingBuilt()
-            or adjacentUnit.Blueprint.CategoriesHash["DUMMYUNIT"]
-        then
+        if self:IsBeingBuilt() or adjacentUnit:IsBeingBuilt() then
             LOG('OnAdjacentTo return')
             return
         end
@@ -819,9 +817,7 @@ StructureUnit = ClassUnit(Unit, BlinkingLightsUnitComponent) {
     OnNotAdjacentTo = function(self, adjacentUnit)
 
         -- make sure we're both finished building
-        if self:IsBeingBuilt() or adjacentUnit:IsBeingBuilt()
-            or adjacentUnit.Blueprint.CategoriesHash["DUMMYUNIT"]
-        then
+        if self:IsBeingBuilt() or adjacentUnit:IsBeingBuilt() then
             LOG('OnNotAdjacentTo return')
             return
         end
diff --git a/units/ZXA0003/ZXA0003_script.lua b/units/ZXA0003/ZXA0003_script.lua
index e195f97b36f..8f0583c7b04 100644
--- a/units/ZXA0003/ZXA0003_script.lua
+++ b/units/ZXA0003/ZXA0003_script.lua
@@ -26,8 +26,6 @@ local DummyUnit = import('/lua/sim/unit.lua').DummyUnit
 ZXA0003 = ClassUnit(DummyUnit) {
 
     OnCreate = function (self)
-        DummyUnit.OnCreate(self)
-
         self:HideBone(0, true)
         -- do not allow the unit to be killed or to take damage
         self.CanTakeDamage = false

From 69fec3068a7820c87d9d44c53b7a98634d96ac1d Mon Sep 17 00:00:00 2001
From: lL1l1 <82986251+lL1l1@users.noreply.github.com>
Date: Wed, 9 Jul 2025 19:48:07 -0700
Subject: [PATCH 08/17] Document CARRIER category behavior

---
 engine/Core/Categories.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/engine/Core/Categories.lua b/engine/Core/Categories.lua
index 4135b201199..d97dd2788dd 100644
--- a/engine/Core/Categories.lua
+++ b/engine/Core/Categories.lua
@@ -59,6 +59,7 @@ categories = {
     CANNOTUSEAIRSTAGING = categoryValue,
     CANTRANSPORTCOMMANDER = categoryValue,
     CAPTURE = categoryValue,
+    --- Changes engine behavior of units attached to this unit: Hides units and makes them unselectable.
     CARRIER = categoryValue,
     --- Allows the unit to land on water. Is introduced by https://github.com/FAForever/FA-Binary-Patches/pull/20
     CANLANDONWATER = categoryValue,

From bf1fb39ad9812fa784729a1cdbd2a07cf8e8165f Mon Sep 17 00:00:00 2001
From: lL1l1 <82986251+lL1l1@users.noreply.github.com>
Date: Fri, 18 Jul 2025 19:25:56 -0700
Subject: [PATCH 09/17] Implement Unit:DebugActiveStates

---
 .../units/components/DebugUnitComponent.lua   | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/lua/sim/units/components/DebugUnitComponent.lua b/lua/sim/units/components/DebugUnitComponent.lua
index 6fa678e86a5..aee3d9887c8 100644
--- a/lua/sim/units/components/DebugUnitComponent.lua
+++ b/lua/sim/units/components/DebugUnitComponent.lua
@@ -22,6 +22,17 @@
 
 local DebugComponent = import("/lua/shared/components/debugcomponent.lua").DebugComponent
 
+---@type UnitState[]
+UnitStates = { 'Immobile', 'Moving', 'Attacking', 'Guarding', 'Building', 'Upgrading',
+    'WaitingForTransport', 'TransportLoading', 'TransportUnloading', 'MovingDown', 'MovingUp',
+    'Patrolling', 'Busy', 'Attached', 'BeingReclaimed', 'Repairing', 'Diving', 'Surfacing',
+    'Teleporting', 'Ferrying', 'WaitForFerry', 'AssistMoving', 'PathFinding', 'ProblemGettingToGoal',
+    'NeedToTerminateTask', 'Capturing', 'BeingCaptured', 'Reclaiming', 'AssistingCommander',
+    'Refueling', 'GuardBusy', 'ForceSpeedThrough', 'UnSelectable', 'DoNotTarget', 'LandingOnPlatform',
+    'CannotFindPlaceToLand', 'BeingUpgraded', 'Enhancing', 'BeingBuilt', 'NoReclaim', 'NoCost',
+    'BlockCommandQueue', 'MakingAttackRun', 'HoldingPattern', 'SiloBuildingAmmo',
+}
+
 ---@class DebugUnitComponent : DebugComponent
 DebugUnitComponent = Class(DebugComponent) {
 
@@ -118,4 +129,19 @@ DebugUnitComponent = Class(DebugComponent) {
         local blueprint = self.Blueprint
         DrawCircle(self:GetPosition(), math.max(blueprint.SizeX, blueprint.SizeY, blueprint.SizeZ), color)
     end,
+
+    DebugActiveStates = function(self)
+        if not self.EnabledLogging then
+            return
+        end
+
+        local activeStates = {}
+        for _, state in UnitStates do
+            if self:IsUnitState(state) then
+                table.insert(activeStates, state)
+            end
+        end
+
+        self:DebugLog('Active states: ' .. table.concat(activeStates, ', '))
+    end,
 }

From 5c6cf021f090469f824487d38345ca40764a4f5b Mon Sep 17 00:00:00 2001
From: lL1l1 <82986251+lL1l1@users.noreply.github.com>
Date: Fri, 18 Jul 2025 19:28:06 -0700
Subject: [PATCH 10/17] Make drones assistable without guard dummies

---
 lua/sim/units/uef/TConstructionPodUnit.lua | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/lua/sim/units/uef/TConstructionPodUnit.lua b/lua/sim/units/uef/TConstructionPodUnit.lua
index 50633e90bdb..b58e103e753 100644
--- a/lua/sim/units/uef/TConstructionPodUnit.lua
+++ b/lua/sim/units/uef/TConstructionPodUnit.lua
@@ -40,9 +40,8 @@ TConstructionPodUnit = ClassUnit(TConstructionUnit) {
     ---@param transport Unit
     ---@param bone number
     OnAttachedToTransport = function(self, transport, bone)
-        local guards = self:GetGuards()
-        IssueClearCommands(guards)
-        IssueGuard(guards, self.guardDummy)
+        -- Removing the state allows guards to keep assisting the drone
+        self:SetUnitState("Attached", false)
         TConstructionUnit.OnAttachedToTransport(self, transport, bone)
     end,
 

From 9a283e89800d440a6e620faee697c9af765d4547 Mon Sep 17 00:00:00 2001
From: lL1l1 <82986251+lL1l1@users.noreply.github.com>
Date: Fri, 18 Jul 2025 19:28:18 -0700
Subject: [PATCH 11/17] Document TConstructionPodUnit guardDummy

---
 lua/sim/units/uef/TConstructionPodUnit.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/sim/units/uef/TConstructionPodUnit.lua b/lua/sim/units/uef/TConstructionPodUnit.lua
index b58e103e753..9dca6482676 100644
--- a/lua/sim/units/uef/TConstructionPodUnit.lua
+++ b/lua/sim/units/uef/TConstructionPodUnit.lua
@@ -5,7 +5,7 @@ local oldGetGuards = TConstructionUnit.GetGuards
 ---@field Pod string
 ---@field Parent? UEL0301 | UEL0001 # Only these two units set the parent properly
 ---@field guardCache table
----@field guardDummy Unit
+---@field guardDummy Unit # Dummy unit to allow assist orders targeting the drone to persist after the drone docks and undocks
 ---@field rebuildDrone boolean # If true, the parent should rebuild the pod. Caches script bit 1.
 TConstructionPodUnit = ClassUnit(TConstructionUnit) {
     Parent = nil,

From 204d6a6ec1ea6012ce7a18548952da118a275027 Mon Sep 17 00:00:00 2001
From: lL1l1 <82986251+lL1l1@users.noreply.github.com>
Date: Mon, 3 Aug 2026 18:53:26 -0700
Subject: [PATCH 12/17] Remove TConstructionPodUnit guardDummy

---
 lua/sim/units/uef/TConstructionPodUnit.lua | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/lua/sim/units/uef/TConstructionPodUnit.lua b/lua/sim/units/uef/TConstructionPodUnit.lua
index 9dca6482676..38faaa7af2c 100644
--- a/lua/sim/units/uef/TConstructionPodUnit.lua
+++ b/lua/sim/units/uef/TConstructionPodUnit.lua
@@ -5,7 +5,6 @@ local oldGetGuards = TConstructionUnit.GetGuards
 ---@field Pod string
 ---@field Parent? UEL0301 | UEL0001 # Only these two units set the parent properly
 ---@field guardCache table
----@field guardDummy Unit # Dummy unit to allow assist orders targeting the drone to persist after the drone docks and undocks
 ---@field rebuildDrone boolean # If true, the parent should rebuild the pod. Caches script bit 1.
 TConstructionPodUnit = ClassUnit(TConstructionUnit) {
     Parent = nil,
@@ -13,9 +12,6 @@ TConstructionPodUnit = ClassUnit(TConstructionUnit) {
     ---@param self TConstructionPodUnit
     OnCreate = function(self)
         TConstructionUnit.OnCreate(self)
-        self.guardDummy = CreateUnitHPR('ZXA0003', self:GetArmy(), 0,0,0,0,0,0)
-        self.guardDummy:AttachTo(self, -1)
-        self.Trash:Add(self.guardDummy)
     end,
 
     ---@param self TConstructionPodUnit
@@ -45,16 +41,6 @@ TConstructionPodUnit = ClassUnit(TConstructionUnit) {
         TConstructionUnit.OnAttachedToTransport(self, transport, bone)
     end,
 
-    ---@param self TConstructionPodUnit
-    ---@param transport Unit
-    ---@param bone number
-    OnDetachedFromTransport = function(self, transport, bone)
-        TConstructionUnit.OnDetachedFromTransport(self, transport, bone)
-        local guards = self.guardDummy:GetGuards()
-        IssueClearCommands(guards)
-        IssueGuard(guards, self)
-    end,
-
     ---@param self TConstructionPodUnit
     ---@param parent UEL0301 | UEL0001 # Only these two implement the function `NotifyOfPodDeath`
     ---@param podName string

From dcb09053eeb618d70cff0780bc6152647272bf85 Mon Sep 17 00:00:00 2001
From: lL1l1 <82986251+lL1l1@users.noreply.github.com>
Date: Mon, 3 Aug 2026 18:58:50 -0700
Subject: [PATCH 13/17] Fix typo

---
 lua/sim/units/uef/TConstructionPodUnit.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lua/sim/units/uef/TConstructionPodUnit.lua b/lua/sim/units/uef/TConstructionPodUnit.lua
index 38faaa7af2c..5333fcbc443 100644
--- a/lua/sim/units/uef/TConstructionPodUnit.lua
+++ b/lua/sim/units/uef/TConstructionPodUnit.lua
@@ -80,7 +80,7 @@ TConstructionPodUnit = ClassUnit(TConstructionUnit) {
     ---@param target Unit|Prop
     OnStopReclaim = function(self, target)
         TConstructionUnit.OnStopReclaim(self, target)
-        -- Check if we finished our reclaim task and clear our cached commaand if so
+        -- Check if we finished our reclaim task and clear our cached command if so
         if self.guardCache and table.empty(target) then
             self.guardCache = nil
         end

From 0fed9b86eca4b56ecd69c5f82e953acb3d905137 Mon Sep 17 00:00:00 2001
From: lL1l1 <82986251+lL1l1@users.noreply.github.com>
Date: Mon, 3 Aug 2026 19:29:47 -0700
Subject: [PATCH 14/17] Fix typo in exfac base bp UNTARGETABLE category

---
 units/ZXA0002/ZXA0002_unit.bp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/units/ZXA0002/ZXA0002_unit.bp b/units/ZXA0002/ZXA0002_unit.bp
index bf4d521d406..df0136355ed 100644
--- a/units/ZXA0002/ZXA0002_unit.bp
+++ b/units/ZXA0002/ZXA0002_unit.bp
@@ -5,7 +5,7 @@ UnitBlueprint {
         'FACTORY',
         'CONSTRUCTION',
         'SELECTABLE',
-        'UNTARGETTABLE',
+        'UNTARGETABLE',
         'RALLYPOINT',
         'SORTCONSTRUCTION',
         'DRAGBUILD',

From 5814924d9b81eba68a8523336c4e7f62dd8a66db Mon Sep 17 00:00:00 2001
From: lL1l1 <82986251+lL1l1@users.noreply.github.com>
Date: Mon, 3 Aug 2026 19:29:59 -0700
Subject: [PATCH 15/17] Mark exfacs as unspawnable units

---
 units/ZXA0002/ZXA0002_unit.bp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/units/ZXA0002/ZXA0002_unit.bp b/units/ZXA0002/ZXA0002_unit.bp
index df0136355ed..eb559a7a509 100644
--- a/units/ZXA0002/ZXA0002_unit.bp
+++ b/units/ZXA0002/ZXA0002_unit.bp
@@ -10,7 +10,8 @@ UnitBlueprint {
         'SORTCONSTRUCTION',
         'DRAGBUILD',
         'SHOWQUEUE',
-        'EXTERNALFACTORYUNIT'
+        'EXTERNALFACTORYUNIT',
+        'UNSPAWNABLE',
     },
     Defense = {
         Health = 100000,

From 3393d9d090cffd0d7c1e724a842fff27ccc8115d Mon Sep 17 00:00:00 2001
From: lL1l1 <82986251+lL1l1@users.noreply.github.com>
Date: Thu, 6 Aug 2026 22:46:55 -0700
Subject: [PATCH 16/17] Simplify ZXA0003

---
 units/ZXA0003/ZXA0003_script.lua | 11 -----------
 units/ZXA0003/ZXA0003_unit.bp    | 30 +-----------------------------
 2 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/units/ZXA0003/ZXA0003_script.lua b/units/ZXA0003/ZXA0003_script.lua
index 8f0583c7b04..a0f0b281a5d 100644
--- a/units/ZXA0003/ZXA0003_script.lua
+++ b/units/ZXA0003/ZXA0003_script.lua
@@ -24,17 +24,6 @@ local DummyUnit = import('/lua/sim/unit.lua').DummyUnit
 
 ---@class ZXA0003 : DummyUnit
 ZXA0003 = ClassUnit(DummyUnit) {
-
-    OnCreate = function (self)
-        self:HideBone(0, true)
-        -- do not allow the unit to be killed or to take damage
-        self.CanTakeDamage = false
-
-        -- do not allow the unit to be reclaimed or targeted by weapons
-        self:SetReclaimable(false)
-        self:SetDoNotTarget(true)
-    end,
-
     DetachFrom = function(self)
     end,
 }
diff --git a/units/ZXA0003/ZXA0003_unit.bp b/units/ZXA0003/ZXA0003_unit.bp
index 00877047646..af09eb475de 100644
--- a/units/ZXA0003/ZXA0003_unit.bp
+++ b/units/ZXA0003/ZXA0003_unit.bp
@@ -8,40 +8,12 @@ UnitBlueprint{
         "UNTARGETABLE",
         "CARRIER",
     },
-    Defense = {
-        Health = 30,
-        MaxHealth = 30,
-    },
-    Display = {
-        Mesh = {
-            IconFadeInZoom = 2000,
-            LODs = {
-                {
-                    ShaderName = 'Unit',
-                    MeshName = '/Units/UEA0001/UEA0001_lod0.scm',
-                    AlbedoName = '/Units/UEA0001/UEA0001_Albedo.dds',
-                    NormalsName = '/Units/UEA0001/UEA0001_normalsTS.dds',
-                    SpecularName = '/Units/UEA0001/UEA0001_SpecTeam.dds',
-                },
-            },
-        },
-        UniformScale = 0.12,
-    },
-    Economy = {
-        BuildCostEnergy = 0,
-        BuildCostMass = 0,
-        BuildTime = 0,
-    },
     General = {
         CapCost = 0,
-        Category = '',
-        SelectionPriority = 3,
     },
     Intel = { VisionRadius = 0 },
     Physics = {
         MotionType = "RULEUMT_None",
     },
-    SizeX = 0,
-    SizeY = 0,
-    SizeZ = 0,
+    CollisionShape = "None"
 }

From cd9558e05c33fbcdaa0dfa8c8d1dbcec27ce4bb8 Mon Sep 17 00:00:00 2001
From: lL1l1 <82986251+lL1l1@users.noreply.github.com>
Date: Sun, 9 Aug 2026 14:39:05 -0700
Subject: [PATCH 17/17] Remove debug logging

---
 lua/sim/units/StructureUnit.lua | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lua/sim/units/StructureUnit.lua b/lua/sim/units/StructureUnit.lua
index 125fde5b8bc..2ff47a08df7 100644
--- a/lua/sim/units/StructureUnit.lua
+++ b/lua/sim/units/StructureUnit.lua
@@ -775,7 +775,6 @@ StructureUnit = ClassUnit(Unit, BlinkingLightsUnitComponent) {
 
         -- make sure we're both finished building
         if self:IsBeingBuilt() or adjacentUnit:IsBeingBuilt() then
-            LOG('OnAdjacentTo return')
             return
         end
 
@@ -818,7 +817,6 @@ StructureUnit = ClassUnit(Unit, BlinkingLightsUnitComponent) {
 
         -- make sure we're both finished building
         if self:IsBeingBuilt() or adjacentUnit:IsBeingBuilt() then
-            LOG('OnNotAdjacentTo return')
             return
         end