Fix error when full share transfers units to a dead player (#6432)

FAForever · Sep 10, 2024 · d3145bc · d3145bc
1 parent 0a94e1c
commit d3145bc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/changelog/snippets/fix.6432.md b/changelog/snippets/fix.6432.md
@@ -0,0 +1 @@
+- (#6432) Fix units failing to transfer after defeat if the player that is being transferred to is defeated during the transfer process.
diff --git a/lua/aibrain.lua b/lua/aibrain.lua
@@ -495,10 +495,10 @@ AIBrain = Class(FactoryManagerBrainComponent, StatManagerBrainComponent, JammerM
                             units = self:GetListOfUnits(categories.ALLUNITS - categories.WALL - categories.COMMAND, false)
                         end
                         if units and not table.empty(units) then
-                            local givenUnitCount = table.getn(TransferUnitsOwnership(units, brain.index))
+                            local givenUnits = TransferUnitsOwnership(units, brain.index)
 
                             -- only show message when we actually gift that player some units
-                            if givenUnitCount > 0 then
+                            if not table.empty(givenUnits) then
                                 Sync.ArmyTransfer = { { from = selfIndex, to = brain.index, reason = "fullshare" } }
                             end
 
@@ -808,10 +808,10 @@ AIBrain = Class(FactoryManagerBrainComponent, StatManagerBrainComponent, JammerM
                 for _, brain in brains do
                     local units = self:GetListOfUnits(cat, false)
                     if units and units[1] then
-                        local givenUnitCount = table.getn(TransferUnitsOwnership(units, brain.index))
+                        local givenUnits = TransferUnitsOwnership(units, brain.index)
 
                         -- only show message when we actually gift that player some units
-                        if givenUnitCount > 0 then
+                        if not table.empty(givenUnits) then
                             Sync.ArmyTransfer = { {
                                 from = army,
                                 to = brain.index,
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		- (#6432) Fix units failing to transfer after defeat if the player that is being transferred to is defeated during the transfer process.