Reset local player in CClientGame in CClientPlayer destructor

Solves crash offset 0005973b
multitheftauto · Sep 25, 2019 · 381d74d · 381d74d
1 parent 19d0895
commit 381d74d
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 1 deletion.
diff --git a/Client/mods/deathmatch/logic/CClientGame.h b/Client/mods/deathmatch/logic/CClientGame.h
@@ -282,10 +282,13 @@ class CClientGame
 
     CBlendedWeather*       GetBlendedWeather() { return m_pBlendedWeather; };
     CNetAPI*               GetNetAPI() { return m_pNetAPI; };
-    CClientPlayer*         GetLocalPlayer() { return m_pLocalPlayer; };
     CRadarMap*             GetRadarMap() { return m_pRadarMap; };
     CMovingObjectsManager* GetMovingObjectsManager() { return m_pMovingObjectsManager; }
 
+    CClientPlayer*       GetLocalPlayer() { return m_pLocalPlayer; }
+    const CClientPlayer* GetLocalPlayer() const { return m_pLocalPlayer; }
+    void                 ResetLocalPlayer() { m_pLocalPlayer = nullptr; }
+
     CUnoccupiedVehicleSync* GetUnoccupiedVehicleSync() { return m_pUnoccupiedVehicleSync; }
     CPedSync*               GetPedSync() { return m_pPedSync; }
 #ifdef WITH_OBJECT_SYNC

diff --git a/Client/mods/deathmatch/logic/CClientPlayer.cpp b/Client/mods/deathmatch/logic/CClientPlayer.cpp
@@ -89,6 +89,17 @@ CClientPlayer::CClientPlayer(CClientManager* pManager, ElementID ID, bool bIsLoc
 
 CClientPlayer::~CClientPlayer()
 {
+    if (m_bIsLocalPlayer)
+    {
+        CClientPlayerManager* playerManager = m_pManager->GetPlayerManager();
+
+        if (playerManager->GetLocalPlayer() == this)
+        {
+            playerManager->SetLocalPlayer(nullptr);
+            g_pClientGame->ResetLocalPlayer();
+        }
+    }
+
     // Remove us from the team
     if (m_pTeam)
         m_pTeam->RemovePlayer(this);