sourcetv: try to fix a crash

RaphaelIT7 · Nov 19, 2024 · 3ef8dd6 · 3ef8dd6
1 parent a859cdb
commit 3ef8dd6
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -2230,7 +2230,10 @@ Returns `IPhysicsEnvironment [NULL]` if invalid.
 Else it returns `IPhysicsEnvironment`.  
 
 #### bool IPhysicsEnvironment:TransferObject(IPhysicsObject obj, IPhysicsEnvironment newEnvironment)
-Transfers the physics object from this environment to the new environment.  
+Transfers the physics object from this environment to the new environment.  #
+
+> [!WARNING]
+> You shouldn't transfer players or vehicles.  
 
 #### IPhysicsEnvironment:SetGravity(Vector newGravity)
 Sets the new gravity in `source_unit/s^2`  

diff --git a/source/modules/sourcetv.cpp b/source/modules/sourcetv.cpp
@@ -76,11 +76,20 @@ static void hook_CHLTVClient_Deconstructor(CHLTVClient* pClient)
 }
 
 static Detouring::Hook detour_CSteam3Server_NotifyClientDisconnect;
-static void hook_CSteam3Server_NotifyClientDisconnect(void* pServer, IClient* pClient)
+static void hook_CSteam3Server_NotifyClientDisconnect(void* pServer, CBaseClient* pClient)
 {
 	VPROF_BUDGET("HolyLib - CSteam3Server::NotifyClientDisconnect", VPROF_BUDGETGROUP_HOLYLIB);
 
-	if (pClient->GetServer()->IsHLTV())
+	if (!hltv)
+	{
+		detour_CSteam3Server_NotifyClientDisconnect.GetTrampoline<Symbols::CSteam3Server_NotifyClientDisconnect>()(pServer, pClient);
+		return;
+	}
+
+	Msg("HLTV: %s\n", pClient->IsHLTV() ? "true" : "false");
+	Msg("Server: %p - %p\n", (CHLTVServer*)pClient->GetServer(), hltv);
+
+	if (pClient->IsHLTV()) // pClient->GetServer()->IsHLTV() crashes... Why.
 	{
 		if (Lua::PushHook("HolyLib:OnSourceTVClientDisconnect"))
 		{