fix up server crash

huoji120 · Oct 10, 2023 · b36738a · b36738a
1 parent d55d0f5
commit b36738a
Showing 1 changed file with 19 additions and 12 deletions.
diff --git a/csgo2/hooks.cpp b/csgo2/hooks.cpp
@@ -56,22 +56,29 @@ void __fastcall hook_GameFrame(void* rcx, bool simulating, bool bFirstTick,
      * true  | game is ticking
      * false | game is not ticking
      */
-    if (simulating && global::HasTicked) {
-        global::m_flUniversalTime +=
-            global::GlobalVars->curtime - global::m_flLastTickedTime;
-    } else {
-        global::m_flUniversalTime += global::GlobalVars->interval_per_tick;
+    if (global::GlobalVars == nullptr) {
+        global::GlobalVars = GetGameGlobals();
     }
+    if (global::GlobalVars != nullptr) {
+        if (simulating && global::HasTicked) {
+            global::m_flUniversalTime +=
+                global::GlobalVars->curtime - global::m_flLastTickedTime;
+        }
+        else {
+            global::m_flUniversalTime += global::GlobalVars->interval_per_tick;
+        }
 
-    global::m_flLastTickedTime = global::GlobalVars->curtime;
-    global::HasTicked = true;
+        global::m_flLastTickedTime = global::GlobalVars->curtime;
+        global::HasTicked = true;
 
-    if (global::EntitySystem == nullptr) {
-        global::EntitySystem = CGameEntitySystem::GetInstance();
-    }
+        if (global::EntitySystem == nullptr) {
+            global::EntitySystem = CGameEntitySystem::GetInstance();
+        }
 
-    GameTimer::ExcuteTimers();
-    GameTickRunTime::ExcuteTickFunctions();
+        GameTimer::ExcuteTimers();
+        GameTickRunTime::ExcuteTickFunctions();
+    }
+
     return origin_GameFrame(rcx, simulating, bFirstTick, bLastTick);
 }
 void __fastcall hook_StartServer(void* rcx,