avoid observers being allied to world owning neutral players

2015-08-05 22:06:45 +02:00
parent 0325f803ab
commit 6c45763d75
1 changed files with 2 additions and 2 deletions
--- a/OpenRA.Game/Player.cs
+++ b/OpenRA.Game/Player.cs
@@ -137,8 +137,8 @@ namespace OpenRA
 		public Dictionary<Player, Stance> Stances = new Dictionary<Player, Stance>();
 		public bool IsAlliedWith(Player p)
 		{
-			// Observers are considered as allies
-			return p == null || Stances[p] == Stance.Ally || p.Spectating;
+			// Observers are considered allies to active combatants
+			return p == null || Stances[p] == Stance.Ally || (p.Spectating && !NonCombatant);
 		}

 		public void SetStance(Player target, Stance s)