From ad269555d9a21ff5a87ed24fd2e241df46d40f24 Mon Sep 17 00:00:00 2001
From: Gustas <37534529+PunkPun@users.noreply.github.com>
Date: Sat, 5 Nov 2022 20:07:30 +0200
Subject: [PATCH] Don't let the player interrupt takeoff after a succesful
 caryall pickup

---
 OpenRA.Mods.Common/Activities/PickupUnit.cs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/OpenRA.Mods.Common/Activities/PickupUnit.cs b/OpenRA.Mods.Common/Activities/PickupUnit.cs
index 19669acf0d..c5e7664d9a 100644
--- a/OpenRA.Mods.Common/Activities/PickupUnit.cs
+++ b/OpenRA.Mods.Common/Activities/PickupUnit.cs
@@ -121,6 +121,10 @@ namespace OpenRA.Mods.Common.Activities
 				}
 			}
 
+			// We don't want to allow TakeOff to be cancelled
+			if (ChildActivity is TakeOff)
+				ChildHasPriority = true;
+
 			// Return once we are in the pickup state and the pickup activities have completed
 			return TickChild(self) && state == PickupState.Pickup;
 		}