From 5d2a9d5f162c8a7f7ba441c887a6b0b383f83bfc Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Wed, 24 Aug 2016 23:29:10 +0200 Subject: [PATCH] Fix GPSDots being visible when the unit is not InWorld or dead --- OpenRA.Mods.RA/Effects/GpsDot.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/OpenRA.Mods.RA/Effects/GpsDot.cs b/OpenRA.Mods.RA/Effects/GpsDot.cs index 9a5346bff1..69c1a88a2b 100644 --- a/OpenRA.Mods.RA/Effects/GpsDot.cs +++ b/OpenRA.Mods.RA/Effects/GpsDot.cs @@ -124,16 +124,14 @@ namespace OpenRA.Mods.RA.Effects if (self.Disposed) world.AddFrameEndTask(w => w.Remove(this)); - if (!self.IsInWorld || self.IsDead) - return; - for (var playerIndex = 0; playerIndex < dotStates.Count; playerIndex++) { var state = dotStates[playerIndex]; var shouldRender = false; - var targetable = (state.Gps.Granted || state.Gps.GrantedAllies) && IsTargetableBy(world.Players[playerIndex], out shouldRender); - state.IsTargetable = targetable; - state.ShouldRender = targetable && shouldRender; + if (self.IsInWorld && !self.IsDead) + state.IsTargetable = (state.Gps.Granted || state.Gps.GrantedAllies) && IsTargetableBy(world.Players[playerIndex], out shouldRender); + + state.ShouldRender = state.IsTargetable && shouldRender; } }