From 7d85c1e81f03322e18fb2e2528c5bfce064b3e4c Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Wed, 16 Jan 2019 18:25:50 +0000 Subject: [PATCH] Remove FrameEndTask from DrawLineToTarget. This is no longer needed and causes ordering issues when the unit becomes idle in the same tick that SetTargetLine is called. --- .../Traits/Render/DrawLineToTarget.cs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/OpenRA.Mods.Common/Traits/Render/DrawLineToTarget.cs b/OpenRA.Mods.Common/Traits/Render/DrawLineToTarget.cs index dbf02b203a..e6a70a952d 100644 --- a/OpenRA.Mods.Common/Traits/Render/DrawLineToTarget.cs +++ b/OpenRA.Mods.Common/Traits/Render/DrawLineToTarget.cs @@ -115,15 +115,12 @@ namespace OpenRA.Mods.Common.Traits if (!self.Owner.IsAlliedWith(self.World.LocalPlayer)) return; - self.World.AddFrameEndTask(w => - { - if (self.Disposed) - return; + if (self.Disposed) + return; - var line = self.TraitOrDefault(); - if (line != null) - line.SetTarget(self, target, color, display); - }); + var line = self.TraitOrDefault(); + if (line != null) + line.SetTarget(self, target, color, display); } } }