Migrate UpdateConnectedClients to static hook

SignatureBeef · Jan 26, 2025 · d712022 · d712022
1 parent b89b305
commit d712022
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/TerrariaServerAPI/TerrariaApi.Server/Hooking/NetHooks.cs b/TerrariaServerAPI/TerrariaApi.Server/Hooking/NetHooks.cs
@@ -23,22 +23,24 @@ public static void AttachTo(HookManager hookManager)
 		HookEvents.Terraria.Netplay.OnConnectionAccepted += OnConnectionAccepted;
 		HookEvents.Terraria.Chat.ChatHelper.BroadcastChatMessage += OnBroadcastChatMessage;
 		HookEvents.Terraria.Net.NetManager.SendData += OnSendNetData;
-			On.Terraria.Netplay.UpdateConnectedClients += OnUpdateConnectedClients;
+		HookEvents.Terraria.Netplay.UpdateConnectedClients += OnUpdateConnectedClients;
 
 		Hooks.NetMessage.SendData += OnSendData;
 		Hooks.NetMessage.SendBytes += OnSendBytes;
 		Hooks.MessageBuffer.GetData += OnReceiveData;
 		Hooks.MessageBuffer.NameCollision += OnNameCollision;
 	}
 
-		static void OnUpdateConnectedClients(On.Terraria.Netplay.orig_UpdateConnectedClients orig)
+	static void OnUpdateConnectedClients(object? sender, HookEvents.Terraria.Netplay.UpdateConnectedClientsEventArgs args)
+	{
+		if (!args.ContinueExecution) return;
+		args.ContinueExecution = false;
+		args.OriginalMethod();
+		if (ServerApi.ForceUpdate)
 		{
-			orig();
-			if (ServerApi.ForceUpdate)
-			{
-				Terraria.Netplay.HasClients = true;
-			}
+			Terraria.Netplay.HasClients = true;
 		}
+	}
 
 	static void OnBroadcastChatMessage(object? sender, HookEvents.Terraria.Chat.ChatHelper.BroadcastChatMessageEventArgs args)
 	{