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

Merge pull request #11809 from obrakmann/fix11808_player-lua-api-breakage

Browse Source 
Fix Lua API returning wrong player info
This commit is contained in:
WolfGaming
2016-08-15 11:57:00 +00:00
committed by GitHub
parent 54b7fd7cf5 f6f81e84df
commit f08853850d
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,18 +39,25 @@ namespace OpenRA.Mods.Common.Scripting
get get
{ {
Game.Debug("The property `PlayerProperties.Race` is deprecated! Use `PlayerProperties.Faction` instead!"); Game.Debug("The property `PlayerProperties.Race` is deprecated! Use `PlayerProperties.Faction` instead!");
return Player.PlayerReference.Faction; return Player.Faction.InternalName;
} }
} }
[Desc("The player's faction.")] [Desc("The player's faction.")]
public string Faction { get { return Player.PlayerReference.Faction; } } public string Faction { get { return Player.Faction.InternalName; } }
[Desc("The player's spawnpoint ID.")] [Desc("The player's spawnpoint ID.")]
public int Spawn { get { return Player.SpawnPoint; } } public int Spawn { get { return Player.SpawnPoint; } }
[Desc("The player's team ID.")] [Desc("The player's team ID.")]
public int Team { get { return Player.PlayerReference.Team; } } public int Team
{
get
{
var c = Player.World.LobbyInfo.Clients[Player.ClientIndex];
return c != null ? c.Team : 0;
}
}
[Desc("Returns true if the player is a bot.")] [Desc("Returns true if the player is a bot.")]
public bool IsBot { get { return Player.IsBot; } } public bool IsBot { get { return Player.IsBot; } }