Process triggered events each pulse

Lpsd · Nov 27, 2023 · 3150666 · 3150666
1 parent 72aeb95
commit 3150666
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/Server/mods/deathmatch/logic/CGame.cpp b/Server/mods/deathmatch/logic/CGame.cpp
@@ -528,8 +528,7 @@ void CGame::DoPulse()
     // Process our resource stop/restart queue
     CLOCK_CALL1(m_pResourceManager->ProcessQueue(););
 
-    if (GetTickCount64_() + m_iClientTriggeredEventsIntervalMs > m_lClientTriggeredEventsLastCheck)
-        ProcessClientTriggeredEventSpam();
+    ProcessClientTriggeredEventSpam();
 
     // Delete all items requested
     CLOCK_CALL1(m_ElementDeleter.DoDeleteAll(););
@@ -4731,10 +4730,7 @@ void CGame::ProcessClientTriggeredEventSpam()
             if (GetTickCount64_() - pair.second >= m_iClientTriggeredEventsIntervalMs)
             {
                 if (pair.first > m_iMaxClientTriggeredEventsPerInterval)
-                {
                     player->CallEvent("onPlayerTriggerEventThreshold", {});
-                    m_mapClientTriggeredEvents.erase(player);
-                }
 
                 m_mapClientTriggeredEvents.erase(player);
             }
@@ -4744,6 +4740,4 @@ void CGame::ProcessClientTriggeredEventSpam()
             m_mapClientTriggeredEvents.erase(player);
         }
     }
-
-    m_lClientTriggeredEventsLastCheck = GetTickCount64_();
 }
diff --git a/Server/mods/deathmatch/logic/CGame.h b/Server/mods/deathmatch/logic/CGame.h
@@ -665,7 +665,6 @@ class CGame
 
     int m_iMaxClientTriggeredEventsPerInterval = 100;
     int m_iClientTriggeredEventsIntervalMs = 1000;
-    long long m_lClientTriggeredEventsLastCheck = 0;
 
     std::map<CPlayer*, std::pair<int, int>> m_mapClientTriggeredEvents;
 };