From 35e0d9e8c8efcb959914734b923ac036d0d6c036 Mon Sep 17 00:00:00 2001
From: Kawe Mazidjatari <48657826+Mauler125@users.noreply.github.com>
Date: Sun, 16 Apr 2023 11:57:45 +0200
Subject: [PATCH] Disable 'cl_threaded_bone_setup' at all times

Disabled in the gamesdk at all times as users have reported issues that causes the game to freeze when switching from a remote server to a listen server. The engine bug still needs to be addressed.
---
 r5dev/engine/host_state.cpp | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/r5dev/engine/host_state.cpp b/r5dev/engine/host_state.cpp
index f4d0eeb2..629bc452 100644
--- a/r5dev/engine/host_state.cpp
+++ b/r5dev/engine/host_state.cpp
@@ -127,18 +127,6 @@ void CHostState::FrameUpdate(CHostState* pHostState, double flCurrentTime, float
 					bResetIdleName = true;
 				}
 
-#if !defined (DEDICATED) && !defined (CLIENT_DLL)
-				// Parallel processing of 'C_BaseAnimating::SetupBones()' is not supported
-				// on listen servers running the local client.
-				if (g_pServer->IsActive())
-				{
-					if (cl_threaded_bone_setup->GetBool())
-					{
-						cl_threaded_bone_setup->SetValue(false);
-					}
-				}
-#endif // !DEDICATED && !CLIENT_DLL
-
 				CHostState_State_Run(&g_pHostState->m_iCurrentState, flCurrentTime, flFrameTime);
 				break;
 			}
@@ -229,6 +217,17 @@ void CHostState::Setup(void)
 	{
 		NET_GenerateKey();
 	}
+#if !defined (DEDICATED) && !defined (CLIENT_DLL)
+	// Parallel processing of 'C_BaseAnimating::SetupBones()' is currently
+	// not supported on listen servers running the local client due to an
+	// engine bug specific to S3 that still needs to be addressed. Remove
+	// this once the issue has been solved:
+	if (cl_threaded_bone_setup->GetBool())
+	{
+		cl_threaded_bone_setup->SetValue(false);
+	}
+#endif // !DEDICATED && !CLIENT_DLL
+
 	ResetLevelName();
 }