From 5e929150959849ffc3db567e1f83237c33bc3326 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Mon, 29 Jun 2020 23:35:29 +0200 Subject: [PATCH] Fix the cargo unload regression with scripted transports The activity is not interruptible, so we'd continue after the Move regardless --- OpenRA.Mods.Common/Traits/Mobile.cs | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Mobile.cs b/OpenRA.Mods.Common/Traits/Mobile.cs index 135bb50bb4..c9972145f0 100644 --- a/OpenRA.Mods.Common/Traits/Mobile.cs +++ b/OpenRA.Mods.Common/Traits/Mobile.cs @@ -699,16 +699,6 @@ namespace OpenRA.Mods.Common.Traits QueueChild(mobile.VisualMove(self, pos, self.World.Map.CenterOfSubCell(cell, subCell))); return true; } - - public override void Cancel(Actor self, bool keepQueue = false) - { - // If we are forbidden from stopping in this cell, use evaluateNearestMovableCell - // to nudge us to the nearest cell that we can stop in. - if (!mobile.CanStayInCell(cell)) - QueueChild(new Move(self, cell, WDist.Zero, null, true)); - - base.Cancel(self, keepQueue); - } } public Activity MoveToTarget(Actor self, Target target,