From d099aa0d46af1df4db1c9dda95ab15b5401be244 Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Sat, 17 Sep 2016 19:10:00 +0200 Subject: [PATCH] Fix crashing when a spy's "real" owner gets changed --- OpenRA.Mods.Common/Traits/Render/RenderDebugState.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/Traits/Render/RenderDebugState.cs b/OpenRA.Mods.Common/Traits/Render/RenderDebugState.cs index c385c407e3..6c6ed11f0a 100644 --- a/OpenRA.Mods.Common/Traits/Render/RenderDebugState.cs +++ b/OpenRA.Mods.Common/Traits/Render/RenderDebugState.cs @@ -65,7 +65,7 @@ namespace OpenRA.Mods.Common.Traits.Render Color GetColor() { - return self.EffectiveOwner != null ? self.EffectiveOwner.Owner.Color.RGB : self.Owner.Color.RGB; + return self.EffectiveOwner != null && self.EffectiveOwner.Disguised ? self.EffectiveOwner.Owner.Color.RGB : self.Owner.Color.RGB; } IEnumerable IRenderAboveShroudWhenSelected.RenderAboveShroud(Actor self, WorldRenderer wr)