From 2975738477957311bedd3cb7e3f8b9612b64dedd Mon Sep 17 00:00:00 2001 From: tovl Date: Fri, 15 Feb 2019 16:07:14 +0100 Subject: [PATCH] make ReturnToBase order queueable --- OpenRA.Mods.Common/Traits/Air/Aircraft.cs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs index c11b5949c9..3fa3f73eeb 100644 --- a/OpenRA.Mods.Common/Traits/Air/Aircraft.cs +++ b/OpenRA.Mods.Common/Traits/Air/Aircraft.cs @@ -838,12 +838,10 @@ namespace OpenRA.Mods.Common.Traits } else if (order.OrderString == "ReturnToBase" && rearmableInfo != null && rearmableInfo.RearmActors.Any()) { - UnReserve(); - self.CancelActivity(); if (!Info.CanHover) - self.QueueActivity(new ReturnToBase(self, Info.AbortOnResupply, null, false)); + self.QueueActivity(order.Queued, new ReturnToBase(self, Info.AbortOnResupply, null, false)); else - self.QueueActivity(new HeliReturnToBase(self, Info.AbortOnResupply, null, false)); + self.QueueActivity(order.Queued, new HeliReturnToBase(self, Info.AbortOnResupply, null, false)); } }