From 2e2f982e41f4febe586c97e753cb9de182b19038 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Thu, 24 May 2018 20:38:02 +0100 Subject: [PATCH] Fix order queuing on Passenger. --- OpenRA.Mods.Common/Traits/Passenger.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Passenger.cs b/OpenRA.Mods.Common/Traits/Passenger.cs index 76781d4610..05ef471e36 100644 --- a/OpenRA.Mods.Common/Traits/Passenger.cs +++ b/OpenRA.Mods.Common/Traits/Passenger.cs @@ -158,11 +158,11 @@ namespace OpenRA.Mods.Common.Traits if (!IsCorrectCargoType(targetActor)) return; - self.SetTargetLine(order.Target, Color.Green); - - self.CancelActivity(); + if (!order.Queued) + self.CancelActivity(); var transports = order.OrderString == "EnterTransports"; + self.SetTargetLine(order.Target, Color.Green); self.QueueActivity(new EnterTransport(self, targetActor, transports ? Info.MaxAlternateTransportAttempts : 0, !transports)); }