Hotfix for Timing overhaul

- Added some checks to prevent extra ticks being accounted into time

Author: thisis2838

GameMemory.cs

@@ -69,8 +69,6 @@ class GameMemory
         private IntPtr _custTimeCountPtr;
         private Detour _custTimeInjection;
 
-        private int _ticksOffset;
-
         public GameState _state;
 
         // TODO: match tickrate as closely as possible without going over
@@ -1032,17 +1030,18 @@ void CheckGameState(GameState state)
             if (state.SignOnState.Current != state.SignOnState.Old)
                 Debug.WriteLine("SignOnState changed to " + state.SignOnState.Current);
 
-            if (state.ServerState.Current == ServerState.Dead)
-                this.SendMiscTimeEvent(_custTimeCountWatcher.Current - _custTimeCountWatcher.Old, MiscTimeType.ClientDisconnectTime);
 
             // if player is fully in game
             if (state.SignOnState.Current == SignOnState.Full && state.HostState.Current == HostState.Run)
             {
                 // note: seems to be slow sometimes. ~3ms
 
-                if (state.ServerState.Current == ServerState.Paused)
-                    this.SendMiscTimeEvent(_custTimeCountWatcher.Current - _custTimeCountWatcher.Old, MiscTimeType.PauseTime);
-                else this.SendSessionTimeUpdateEvent(_custTimeCountWatcher.Current - _custTimeCountWatcher.Old);
+                if (state.TickCount > 0)
+                {
+                    if (state.ServerState.Current == ServerState.Paused)
+                        this.SendMiscTimeEvent(_custTimeCountWatcher.Current - _custTimeCountWatcher.Old, MiscTimeType.PauseTime);
+                    else this.SendSessionTimeUpdateEvent(_custTimeCountWatcher.Current - _custTimeCountWatcher.Old);
+                }
 
                 // first tick when player is fully in game
                 if (state.SignOnState.Current != state.SignOnState.Old)
@@ -1071,11 +1070,11 @@ void CheckGameState(GameState state)
             {
                 if (state.HostState.Old == HostState.Run)
                 {
-                    _ticksOffset = 0;
-
                     // the map changed or a quicksave was loaded
                     Debug.WriteLine("session ended");
 
+                    state.TickBase = -1;
+
                     // the map changed or a save was loaded
                     this.SendSessionEndedEvent();
 
@@ -1140,6 +1139,10 @@ void CheckGameState(GameState state)
                 if (state.GameSupport != null)
                     state.QueueOnNextSessionEnd = GameSupportResult.DoNothing;
             }
+
+
+            if (state.ServerState.Current == ServerState.Dead && state.HostState.Current == HostState.Run)
+                this.SendMiscTimeEvent(_custTimeCountWatcher.Current - _custTimeCountWatcher.Old, MiscTimeType.ClientDisconnectTime);
         }
 
         void HandleGameSupportResult(GameSupportResult result, GameState state)

SourceSplitComponent.cs

@@ -467,7 +467,7 @@ void gameMemory_OnMiscTime(object sender, MiscTimeEventArgs e)
                         return;
                     break;
                 case MiscTimeType.ClientDisconnectTime:
-                    if (this.GameTimingMethod != GameTimingMethod.AllEngineTicks && this.GameTimingMethod != GameTimingMethod.EngineTicksWithPauses)
+                    if (this.GameTimingMethod != GameTimingMethod.AllEngineTicks)
                         return;
                     break;
                 case MiscTimeType.EndPause: