From 09b9ed350686ccdecfb33e47f5a9f2342e88eb74 Mon Sep 17 00:00:00 2001 From: BGluth Date: Fri, 20 Jul 2018 00:32:53 -0600 Subject: [PATCH] Rearming aircraft now reapplies rearming order if canceled on landing structure - Implemented by making the ResupplyAircraft activity recreate a new resupply activity if cancelled and also having no other queued activities. - Tested in TD, RA, TS. --- OpenRA.Mods.Common/Activities/Air/ResupplyAircraft.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenRA.Mods.Common/Activities/Air/ResupplyAircraft.cs b/OpenRA.Mods.Common/Activities/Air/ResupplyAircraft.cs index 67232528c3..9fd113218d 100644 --- a/OpenRA.Mods.Common/Activities/Air/ResupplyAircraft.cs +++ b/OpenRA.Mods.Common/Activities/Air/ResupplyAircraft.cs @@ -50,6 +50,10 @@ namespace OpenRA.Mods.Common.Activities public override Activity Tick(Actor self) { + // Conditional fixes being able to stop aircraft from resupplying. + if (IsCanceled && NextInQueue == null) + OnFirstRun(self); + return NextActivity; } }