From 6528edecb188ac52c8ac1fe87f705ed10b7385ff Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sun, 27 May 2018 11:51:33 +0100 Subject: [PATCH] Fix order queuing on Repairable. --- OpenRA.Mods.Common/Traits/Repairable.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Repairable.cs b/OpenRA.Mods.Common/Traits/Repairable.cs index 923b6f0757..03ae9fab81 100644 --- a/OpenRA.Mods.Common/Traits/Repairable.cs +++ b/OpenRA.Mods.Common/Traits/Repairable.cs @@ -100,9 +100,10 @@ namespace OpenRA.Mods.Common.Traits if (!CanRepairAt(order.Target.Actor) || (!CanRepair() && !CanRearm())) return; - self.SetTargetLine(order.Target, Color.Green); + if (!order.Queued) + self.CancelActivity(); - self.CancelActivity(); + self.SetTargetLine(order.Target, Color.Green); self.QueueActivity(new WaitForTransport(self, ActivityUtils.SequenceActivities(new MoveAdjacentTo(self, order.Target), new CallFunc(() => AfterReachActivities(self, order, movement)))));