Fix crash on reconnect

TheNormalnij · Jan 31, 2025 · cf75844 · cf75844
1 parent 5454969
commit cf75844
Showing 1 changed file with 21 additions and 0 deletions.
diff --git a/Client/game_sa/CPtrNodeSingleLinkPoolSA.cpp b/Client/game_sa/CPtrNodeSingleLinkPoolSA.cpp
@@ -36,10 +36,31 @@ static CPtrNodeSingleLinkPoolSA::pool_item_t* __cdecl HOOK_SingleLinkNodeDestruc
     return item;
 }
 
+// Replace pool->RemoveItem here
+constexpr std::uint32_t      HOOKPOS_CPtrListSingleLink_Flush = 0x55243B;
+constexpr std::size_t        HOOKSIZE_CPtrListSingleLink_Flush = 6;
+constexpr std::uint32_t      CONTINUE_CPtrListSingleLink_Flush = 0x55245B;
+static void _declspec(naked) HOOK_CPtrListSingleLink_Flush()
+{
+    __asm {
+        mov edi, ecx ; save register
+
+        ; CPtrNodeSingleLinkPoolSA::m_customPool->RemoveItem(eax)
+
+        mov ecx, CPtrNodeSingleLinkPoolSA::m_customPool
+        push eax
+        call CPtrNodeSingleLinkPoolSA::pool_t::RemoveItem
+
+        mov ecx, edi ; restore
+        jmp CONTINUE_CPtrListSingleLink_Flush
+    }
+}
+
 void CPtrNodeSingleLinkPoolSA::StaticSetHooks()
 {
     EZHookInstall(SingleLinkNodeConstructor);
     EZHookInstall(SingleLinkNodeDestructor);
+    EZHookInstall(CPtrListSingleLink_Flush);
 
     // Skip the original pool initialization
     MemCpy((void*)0x550F26, "\xEB\x2D", 2);