Merge remote-tracking branch 'upstream/general-devel' into net9-upgrade

Author: SignatureBeef

TerrariaServerAPI/TerrariaApi.Server/Hooking/NetHooks.cs

@@ -23,13 +23,23 @@ 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;
 
 		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)
+		{
+			orig();
+			if (ServerApi.ForceUpdate)
+			{
+				Terraria.Netplay.HasClients = true;
+			}
+		}
+
 	static void OnBroadcastChatMessage(object? sender, HookEvents.Terraria.Chat.ChatHelper.BroadcastChatMessageEventArgs args)
 	{
 		if (!args.ContinueExecution) return;