From 1df42a7d5e628a2667cf43b143d426a12c5193fb Mon Sep 17 00:00:00 2001
From: Paul Chote <paul@chote.net>
Date: Wed, 23 Feb 2011 21:54:11 +1300
Subject: [PATCH] Give upgraded mpspawns an owner.

---
 OpenRA.Game/Map.cs | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/OpenRA.Game/Map.cs b/OpenRA.Game/Map.cs
index 5be043945b..cf29e55ffb 100644
--- a/OpenRA.Game/Map.cs
+++ b/OpenRA.Game/Map.cs
@@ -122,6 +122,12 @@ namespace OpenRA
 			if (MapFormat < 4)
 				throw new InvalidDataException("Map format {0} is not supported.\n File: {1}".F(MapFormat, path));
 			
+			// Load players
+			foreach (var kv in yaml.NodesDict["Players"].NodesDict)
+			{
+				var player = new PlayerReference(kv.Value);
+				Players.Add(player.Name, player);
+			}
 			
 			Actors = Lazy.New(() =>
 			{
@@ -138,18 +144,14 @@ namespace OpenRA
 						string[] loc = wp.Value.Value.Split( ',' );
 						var a = new ActorReference("mpspawn");
 						a.Add(new LocationInit(new int2( int.Parse( loc[ 0 ] ), int.Parse( loc[ 1 ] ) )));
+						a.Add(new OwnerInit(Players.First(p => p.Value.OwnsWorld).Key));
 						ret.Add(wp.Key, a);
 					}
 				
 				return ret;
 			});
 			
-			// Load players
-			foreach (var kv in yaml.NodesDict["Players"].NodesDict)
-			{
-				var player = new PlayerReference(kv.Value);
-				Players.Add(player.Name, player);
-			}
+
 
 			// Upgrade map to format 5
 			if (MapFormat < 5)