From 5075997264b48e27960e3446a948ecb0ea0f5a03 Mon Sep 17 00:00:00 2001
From: quicm <2648373+quicm@users.noreply.github.com>
Date: Tue, 17 Dec 2024 01:13:01 +1030
Subject: [PATCH] Add bandaid fix to RemoteClient.Reset for SecAd
 GHSA-hvm9-wc8j-mgrc

---
 TShockAPI/TShock.cs        | 8 ++++++++
 TShockAPI/TShockAPI.csproj | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index 054e31dfa..bcd72aa36 100644
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -428,6 +428,8 @@ public override void Initialize()
 				Hooks.AccountHooks.AccountDelete += OnAccountDelete;
 				Hooks.AccountHooks.AccountCreate += OnAccountCreate;
 
+				On.Terraria.RemoteClient.Reset += RemoteClient_Reset;
+
 				GetDataHandlers.InitGetDataHandler();
 				Commands.InitCommands();
 
@@ -496,6 +498,12 @@ void SafeError(string message)
 			}
 		}
 
+		private static void RemoteClient_Reset(On.Terraria.RemoteClient.orig_Reset orig, RemoteClient client)
+		{
+			client.ClientUUID = null;
+			orig(client);
+		}
+
 		private static void OnAchievementInitializerLoad(ILContext il)
 		{
 			// Modify AchievementInitializer.Load to remove the Main.netMode == 2 check (occupies the first 4 IL instructions)
diff --git a/TShockAPI/TShockAPI.csproj b/TShockAPI/TShockAPI.csproj
index a37317092..9da8cd085 100644
--- a/TShockAPI/TShockAPI.csproj
+++ b/TShockAPI/TShockAPI.csproj
@@ -18,7 +18,7 @@
       Also, be sure to release on github with the exact assembly version tag as below
       so that the update manager works correctly (via the Github releases api and mimic)
     -->
-    <Version>5.2.0</Version>
+    <Version>5.2.1</Version>
     <AssemblyTitle>TShock for Terraria</AssemblyTitle>
     <Company>Pryaxis &amp; TShock Contributors</Company>
     <Product>TShockAPI</Product>