Merge pull request #8659 from penev92/bleed_playerReference

Rename PlayerReference.Race to Faction
2015-07-14 20:15:56 +02:00
parent b58d1037ea 6fc9abe599
commit 4ed7a4ce8a
166 changed files with 440 additions and 425 deletions
--- a/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
+++ b/OpenRA.Mods.Common/ServerTraits/LobbyCommands.cs
@@ -900,7 +900,7 @@ namespace OpenRA.Mods.Common.Server
 				PlayerReference = pr.Name,
 				Closed = false,
 				AllowBots = pr.AllowBots,
-				LockRace = pr.LockRace,
+				LockRace = pr.LockFaction,
 				LockColor = pr.LockColor,
 				LockTeam = pr.LockTeam,
 				LockSpawn = pr.LockSpawn,