From d099aa0d46af1df4db1c9dda95ab15b5401be244 Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Sat, 17 Sep 2016 19:10:00 +0200 Subject: [PATCH 1/2] 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) From a4a726c19a1999c98a735685a02f5f18a9a4108c Mon Sep 17 00:00:00 2001 From: Oliver Brakmann Date: Sun, 18 Sep 2016 13:32:20 +0200 Subject: [PATCH 2/2] Remove workarounds for ownership change breakage from 'Infiltration' --- mods/ra/maps/infiltration/rules.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/mods/ra/maps/infiltration/rules.yaml b/mods/ra/maps/infiltration/rules.yaml index 47b0263077..335a78f22f 100644 --- a/mods/ra/maps/infiltration/rules.yaml +++ b/mods/ra/maps/infiltration/rules.yaml @@ -54,9 +54,6 @@ SPY.Strong: Types: MissionObjective ExternalCaptures: CaptureTypes: MissionObjective - EditorOnlyTooltip: - Description: RenderDebugState.OnOwnerChange will crash - -RenderDebugState: Passenger: GrantUpgrades: mobile @@ -187,9 +184,6 @@ STEK: MCV: Buildable: Prerequisites: ~disabled - EditorOnlyTooltip: - Description: RenderDebugState.OnOwnerChange will crash - -RenderDebugState: APC: Buildable: