From d5da93563e20ea0124b4d2d6bab1d821a98bcea3 Mon Sep 17 00:00:00 2001
From: Egor <egor@opensrc.club>
Date: Fri, 27 Apr 2018 19:52:20 +0300
Subject: [PATCH 1/2] s/PlayerID/PlayerId

---
 TShockAPI/GetDataHandlers.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index 02be7f7f..baea2f82 100644
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -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,
 			};

From a21eb31438a3543d3fdacbbffe73b555d86b7bb5 Mon Sep 17 00:00:00 2001
From: Egor <egor@opensrc.club>
Date: Fri, 27 Apr 2018 20:11:43 +0300
Subject: [PATCH 2/2] Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69a833c3..f3ad3bfa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -83,6 +83,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
 * Removed the stat tracking system. (@hakusaro)
 * Fixed erroneous kicks and bans when using `KickOnMediumcoreDeath` and `BanOnMediumcoreDeath` options. (@DankRank)
 * Removed `TSPlayer.InitSpawn` field. (@DankRank)
+* `OnPlayerSpawn`'s player ID field is now `PlayerId`. (@DankRank)
 
 ## TShock 4.3.25
 * Fixed a critical exploit in the Terraria protocol that could cause massive unpreventable world corruption as well as a number of other problems. Thanks to @bartico6 for reporting. Fixed by the efforts of @QuiCM, @hakusaro, and tips in the right directioon from @bartico6.