From 5db07097e81dd16f16f97946819acc415ce14f7f Mon Sep 17 00:00:00 2001 From: Gustas <37534529+PunkPun@users.noreply.github.com> Date: Sat, 29 Oct 2022 14:23:44 +0300 Subject: [PATCH] Fix carryall not removing influence when cancelling land activity --- OpenRA.Mods.Common/Activities/PickupUnit.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/OpenRA.Mods.Common/Activities/PickupUnit.cs b/OpenRA.Mods.Common/Activities/PickupUnit.cs index 56842b76ed..19669acf0d 100644 --- a/OpenRA.Mods.Common/Activities/PickupUnit.cs +++ b/OpenRA.Mods.Common/Activities/PickupUnit.cs @@ -73,6 +73,15 @@ namespace OpenRA.Mods.Common.Activities if (carryall.State == Carryall.CarryallState.Reserved) carryall.UnreserveCarryable(self); + // Make sure we run the TakeOff activity if we are / have landed + if (self.Trait().HasInfluence()) + { + ChildHasPriority = true; + IsInterruptible = false; + QueueChild(new TakeOff(self)); + return false; + } + return true; }