Addendum to #3251 (#3252)

Addendum #2 to eae47fe / #3251
multitheftauto · Nov 27, 2023 · 9544a34 · 9544a34
1 parent 34f00f3
commit 9544a34
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Server/mods/deathmatch/logic/CGame.cpp b/Server/mods/deathmatch/logic/CGame.cpp
@@ -528,6 +528,9 @@ void CGame::DoPulse()
     // Process our resource stop/restart queue
     CLOCK_CALL1(m_pResourceManager->ProcessQueue(););
 
+    if (GetTickCount64_() + m_iClientTriggeredEventsIntervalMs > m_lClientTriggeredEventsLastCheck)
+        ProcessClientTriggeredEventSpam();
+
     // Delete all items requested
     CLOCK_CALL1(m_ElementDeleter.DoDeleteAll(););
 
@@ -551,9 +554,6 @@ void CGame::DoPulse()
     PrintLogOutputFromNetModule();
     m_pScriptDebugging->UpdateLogOutput();
 
-    if (GetTickCount64_() + m_iClientTriggeredEventsIntervalMs > m_lClientTriggeredEventsLastCheck)
-        ProcessClientTriggeredEventSpam();
-
     // Unlock the critical section again
     Unlock();
 }
@@ -4708,7 +4708,7 @@ void CGame::HandleCrashDumpEncryption()
 
 void CGame::RegisterClientTriggeredEventUsage(CPlayer* pPlayer)
 {
-    if (!pPlayer)
+    if (!pPlayer && pPlayer->IsPlayer() && !pPlayer->IsBeingDeleted())
         return;
 
     m_mapClientTriggeredEvents[pPlayer]++;