Merge pull request #11903 from abcdefg30/indexing

Fix a possible crash in the lua Player.Team property
2016-08-28 14:16:48 +02:00
parent 5b2d6e9a47 284d5e5af5
commit 1c12ad5cee
2 changed files with 1 additions and 5 deletions
--- 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;
 			}
 		}