Merge branch 'general-devel' into regions

This commit is contained in:
Lucas Nicodemus 2018-05-06 09:07:15 -06:00 committed by GitHub
commit c06e000997
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 2 deletions

View file

@ -803,7 +803,7 @@ namespace TShockAPI
/// <summary>
/// The Terraria playerID of the player
/// </summary>
public byte PlayerID { get; set; }
public byte PlayerId { get; set; }
/// <summary>
/// X location of the player's spawn
/// </summary>
@ -827,7 +827,7 @@ namespace TShockAPI
{
Player = player,
Data = data,
PlayerID = pid,
PlayerId = pid,
SpawnX = spawnX,
SpawnY = spawnY,
};