Merge pull request #11903 from abcdefg30/indexing
Fix a possible crash in the lua Player.Team property
This commit is contained in:
@@ -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()
|
||||
{
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user