From 3b36ddfc54065cb12277795d60ae5049bff56b21 Mon Sep 17 00:00:00 2001
From: deniz1a <deniz1a@deniz1a>
Date: Sat, 15 Aug 2015 03:16:54 +0300
Subject: [PATCH] Removes LocalPlayer check from HideMapCrateAction and
 RevealMapCrateAction. Fixes #9063. Fixes #9127.

---
 .../Traits/Crates/HideMapCrateAction.cs       |  4 +---
 .../Traits/Crates/RevealMapCrateAction.cs     | 19 +++++++------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/OpenRA.Mods.Common/Traits/Crates/HideMapCrateAction.cs b/OpenRA.Mods.Common/Traits/Crates/HideMapCrateAction.cs
index 97c5485f0d..c9662b10d5 100644
--- a/OpenRA.Mods.Common/Traits/Crates/HideMapCrateAction.cs
+++ b/OpenRA.Mods.Common/Traits/Crates/HideMapCrateAction.cs
@@ -32,9 +32,7 @@ namespace OpenRA.Mods.Common.Traits
 
 		public override void Activate(Actor collector)
 		{
-			if (collector.Owner == collector.World.LocalPlayer)
-				collector.Owner.Shroud.ResetExploration();
-
+			collector.Owner.Shroud.ResetExploration();
 			base.Activate(collector);
 		}
 	}
diff --git a/OpenRA.Mods.Common/Traits/Crates/RevealMapCrateAction.cs b/OpenRA.Mods.Common/Traits/Crates/RevealMapCrateAction.cs
index 08bb3a8ec8..f9b7f46726 100644
--- a/OpenRA.Mods.Common/Traits/Crates/RevealMapCrateAction.cs
+++ b/OpenRA.Mods.Common/Traits/Crates/RevealMapCrateAction.cs
@@ -8,8 +8,6 @@
  */
 #endregion
 
-using OpenRA.Traits;
-
 namespace OpenRA.Mods.Common.Traits
 {
 	[Desc("Reveals the entire map.")]
@@ -31,18 +29,15 @@ namespace OpenRA.Mods.Common.Traits
 			this.info = info;
 		}
 
-		bool ShouldReveal(Player collectingPlayer)
-		{
-			if (info.IncludeAllies)
-				return collectingPlayer.World.LocalPlayer != null &&
-					collectingPlayer.Stances[collectingPlayer.World.LocalPlayer] == Stance.Ally;
-
-			return collectingPlayer == collectingPlayer.World.LocalPlayer;
-		}
-
 		public override void Activate(Actor collector)
 		{
-			if (ShouldReveal(collector.Owner))
+			if (info.IncludeAllies)
+			{
+				foreach (var player in collector.World.Players)
+					if (collector.Owner.IsAlliedWith(player))
+						player.Shroud.ExploreAll(player.World);
+			}
+			else
 				collector.Owner.Shroud.ExploreAll(collector.World);
 
 			base.Activate(collector);