Fix crash caused by queuing multiple pick up orders for a single unit.

Inq8 · May 25, 2024 · 5115947 · 5115947
1 parent d3d4bdd
commit 5115947
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/OpenRA.Mods.Common/Activities/PickupUnit.cs b/OpenRA.Mods.Common/Activities/PickupUnit.cs
@@ -68,6 +68,10 @@ public override bool Tick(Actor self)
 			if (IsCanceling)
 				return true;
 
+			// If already carrying the target (can happen queuing multiple orders to pick up the same target)
+			if (carryall.State == Carryall.CarryallState.Carrying && cargo == carryall.Carryable && ChildActivity is not TakeOff)
+				return true;
+
 			if (cargo.IsDead || carryable.IsTraitDisabled || !cargo.AppearsFriendlyTo(self) || cargo != carryall.Carryable)
 			{
 				Cancel(self, true);