From 10e51db236fafab5326f5fa3fdc73c6b301988b0 Mon Sep 17 00:00:00 2001
From: reaperrr <thereaperrr@aol.com>
Date: Tue, 20 Nov 2018 16:02:05 +0100
Subject: [PATCH] Remove hardcoded mpspawn owner lint check

Use RequiresSpecificOwner to enforce the owner
that owns the world instead.

Require 'Neutral' in the official mods accordingly.
---
 OpenRA.Mods.Common/Lint/CheckPlayers.cs | 5 -----
 mods/cnc/rules/misc.yaml                | 2 ++
 mods/d2k/rules/misc.yaml                | 2 ++
 mods/ra/rules/misc.yaml                 | 2 ++
 mods/ts/rules/misc.yaml                 | 2 ++
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/OpenRA.Mods.Common/Lint/CheckPlayers.cs b/OpenRA.Mods.Common/Lint/CheckPlayers.cs
index 7a0ba26378..162aa02e82 100644
--- a/OpenRA.Mods.Common/Lint/CheckPlayers.cs
+++ b/OpenRA.Mods.Common/Lint/CheckPlayers.cs
@@ -91,11 +91,6 @@ namespace OpenRA.Mods.Common.Lint
 					var ownerName = ownerInit.PlayerName;
 					if (!playerNames.Contains(ownerName))
 						emitError("Actor {0} is owned by unknown player {1}.".F(kv.Key, ownerName));
-					else if (kv.Value.Value == "mpspawn" && !players[ownerName].OwnsWorld)
-					{
-						emitError("Actor {0} needs to be owned by the player that owns the world. ".F(kv.Key) +
-							"Use the `Spawn` and `LockSpawn` player properties to force players onto a particular spawn instead.");
-					}
 
 					RequiresSpecificOwnersInfo info;
 					if (actorsWithRequiredOwner.TryGetValue(kv.Value.Value, out info))
diff --git a/mods/cnc/rules/misc.yaml b/mods/cnc/rules/misc.yaml
index 60e884649d..3f58da9748 100644
--- a/mods/cnc/rules/misc.yaml
+++ b/mods/cnc/rules/misc.yaml
@@ -58,6 +58,8 @@ mpspawn:
 		QuantizedFacings: 1
 	MapEditorData:
 		Categories: System
+	RequiresSpecificOwners:
+		ValidOwnerNames: Neutral
 
 waypoint:
 	Interactable:
diff --git a/mods/d2k/rules/misc.yaml b/mods/d2k/rules/misc.yaml
index f5030d9521..6d2d94e305 100644
--- a/mods/d2k/rules/misc.yaml
+++ b/mods/d2k/rules/misc.yaml
@@ -152,6 +152,8 @@ mpspawn:
 		QuantizedFacings: 1
 	MapEditorData:
 		Categories: System
+	RequiresSpecificOwners:
+		ValidOwnerNames: Neutral
 
 waypoint:
 	Interactable:
diff --git a/mods/ra/rules/misc.yaml b/mods/ra/rules/misc.yaml
index 072e1d8b84..642da14b5f 100644
--- a/mods/ra/rules/misc.yaml
+++ b/mods/ra/rules/misc.yaml
@@ -373,6 +373,8 @@ mpspawn:
 		QuantizedFacings: 1
 	MapEditorData:
 		Categories: System
+	RequiresSpecificOwners:
+		ValidOwnerNames: Neutral
 
 waypoint:
 	Interactable:
diff --git a/mods/ts/rules/misc.yaml b/mods/ts/rules/misc.yaml
index e54ecb86c0..c183a8cf76 100644
--- a/mods/ts/rules/misc.yaml
+++ b/mods/ts/rules/misc.yaml
@@ -11,6 +11,8 @@ mpspawn:
 		QuantizedFacings: 1
 	MapEditorData:
 		Categories: System
+	RequiresSpecificOwners:
+		ValidOwnerNames: Neutral
 
 waypoint:
 	Interactable: