From 73198dc45a885976a5542687581fc3ead4c1d20b Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Wed, 5 Dec 2018 18:04:50 +1300 Subject: [PATCH] Fix queued EnterTransport unload glitch. --- OpenRA.Mods.Common/Activities/EnterTransport.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/OpenRA.Mods.Common/Activities/EnterTransport.cs b/OpenRA.Mods.Common/Activities/EnterTransport.cs index b0b185bc56..c535535250 100644 --- a/OpenRA.Mods.Common/Activities/EnterTransport.cs +++ b/OpenRA.Mods.Common/Activities/EnterTransport.cs @@ -55,6 +55,10 @@ namespace OpenRA.Mods.Common.Activities }); Done(self); + + // Preemptively cancel any activities to avoid an edge-case where successively queued + // EnterTransports corrupt the actor state. Activities are cancelled again on unload + self.CancelActivity(); } protected override bool TryGetAlternateTarget(Actor self, int tries, ref Target target)