epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #11903 from abcdefg30/indexing

Browse Source 
Fix a possible crash in the lua Player.Team property
This commit is contained in:
Oliver Brakmann
2016-08-28 14:16:48 +02:00
committed by GitHub
parent 5b2d6e9a47 284d5e5af5
commit 1c12ad5cee
2 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenRA.Game/Server/Server.cs
View File

@@ -220,10 +220,6 @@ namespace OpenRA.Server
}) { IsBackground = true }.Start(); }) { IsBackground = true }.Start();
} }
/* lobby rework TODO:
* - "teams together" option for team games -- will eliminate most need
* for manual spawnpoint choosing.
*/
int nextPlayerIndex; int nextPlayerIndex;
public int ChooseFreePlayerIndex() public int ChooseFreePlayerIndex()
{ {

2
OpenRA.Mods.Common/Scripting/Properties/PlayerProperties.cs
View File

@@ -54,7 +54,7 @@ namespace OpenRA.Mods.Common.Scripting
{ {
get 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; return c != null ? c.Team : 0;
} }
} }