From 9ddc9073c2d9a9c9df98b10af5b0c0f70fa9d971 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Thu, 29 Oct 2020 22:10:02 +0000 Subject: [PATCH] Revert "Determine stance for spectators based on shroud selection" This reverts commit e459fde031e3cec120065883eea62a663a097123. --- OpenRA.Game/Player.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/OpenRA.Game/Player.cs b/OpenRA.Game/Player.cs index 8db71497bc..c2537e016a 100644 --- a/OpenRA.Game/Player.cs +++ b/OpenRA.Game/Player.cs @@ -225,11 +225,7 @@ namespace OpenRA public Dictionary Stances = new Dictionary(); public bool IsAlliedWith(Player p) { - // Current shroud selection is used to determine stance for spectators - if (p != null && p.Spectating && !NonCombatant && p.World.RenderPlayer != null) - return Stances[p.World.RenderPlayer] == Stance.Ally; - - // Observers are considered allies if RenderPlayer property is null + // Observers are considered allies to active combatants return p == null || Stances[p] == Stance.Ally || (p.Spectating && !NonCombatant); }