Fix unit transfer enabling enhancement-locked weapons (#6544)

For example Seraphim SACU TML was being enabled when transferred.
FAForever · Dec 26, 2024 · 2b1d276 · 2b1d276
1 parent 8946edc
commit 2b1d276
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/changelog/snippets/fix.6544.md b/changelog/snippets/fix.6544.md
@@ -0,0 +1 @@
+- (#6544) Fix unit transfer enabling weapons locked by enhancements, such as the TML of the Seraphim SACU.
diff --git a/lua/SimUtils.lua b/lua/SimUtils.lua
@@ -302,8 +302,12 @@ function TransferUnitsOwnership(units, toArmy, captured)
         -- disable all weapons, enable with a delay
         for k = 1, unit.WeaponCount do
             local weapon = unit:GetWeapon(k)
-            weapon:SetEnabled(false)
-            weapon:ForkThread(TransferUnitsOwnershipDelayedWeapons)
+            -- Weapons disabled by enhancement shouldn't be re-enabled unless the enhancement is built
+            local enablingEnhancement = weapon.Blueprint.EnabledByEnhancement
+            if not enablingEnhancement or (activeEnhancements and activeEnhancements[enablingEnhancement]) then
+                weapon:SetEnabled(false)
+                weapon:ForkThread(TransferUnitsOwnershipDelayedWeapons)
+            end
         end
     end
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- (#6544) Fix unit transfer enabling weapons locked by enhancements, such as the TML of the Seraphim SACU.