From 57d6f678e153e62678e38035e0b12241a86cf4a6 Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Sat, 27 Aug 2016 19:24:25 +0200 Subject: [PATCH 1/2] Remove an outdated TODO comment --- OpenRA.Game/Server/Server.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs index 9340a6a2a3..39f5d6bdc4 100644 --- a/OpenRA.Game/Server/Server.cs +++ b/OpenRA.Game/Server/Server.cs @@ -220,10 +220,6 @@ namespace OpenRA.Server }) { IsBackground = true }.Start(); } - /* lobby rework TODO: - * - "teams together" option for team games -- will eliminate most need - * for manual spawnpoint choosing. - */ int nextPlayerIndex; public int ChooseFreePlayerIndex() { From 284d5e5af5e58321d509514d4024d5259df661ba Mon Sep 17 00:00:00 2001 From: abcdefg30 Date: Sat, 27 Aug 2016 19:44:37 +0200 Subject: [PATCH 2/2] Fix a possible crash in the lua Player.Team property --- OpenRA.Mods.Common/Scripting/Properties/PlayerProperties.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OpenRA.Mods.Common/Scripting/Properties/PlayerProperties.cs b/OpenRA.Mods.Common/Scripting/Properties/PlayerProperties.cs index bbe7812119..3def7777bc 100644 --- a/OpenRA.Mods.Common/Scripting/Properties/PlayerProperties.cs +++ b/OpenRA.Mods.Common/Scripting/Properties/PlayerProperties.cs @@ -54,7 +54,7 @@ namespace OpenRA.Mods.Common.Scripting { get { - var c = Player.World.LobbyInfo.Clients[Player.ClientIndex]; + var c = Player.World.LobbyInfo.Clients.FirstOrDefault(i => i.Index == Player.ClientIndex); return c != null ? c.Team : 0; } }