From 6c45763d752c8d7914c74be64c4c994f318b6139 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= <matthias@mailaender.name>
Date: Wed, 5 Aug 2015 22:06:45 +0200
Subject: [PATCH] avoid observers being allied to world owning neutral players

---
 OpenRA.Game/Player.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/OpenRA.Game/Player.cs b/OpenRA.Game/Player.cs
index 1805074320..a47894d6e3 100644
--- 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)