Merge pull request #12046 from obrakmann/fix11996_spy-exodus-crash
Fix crashing when a spy's "real" owner gets changed
This commit is contained in:
@@ -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<IRenderable> IRenderAboveShroudWhenSelected.RenderAboveShroud(Actor self, WorldRenderer wr)
|
||||
|
||||
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user