fix usage of EntryCar.Reset()

Author: compujuckel

AssettoServer/Server/EntryCar.cs

@@ -3,11 +3,9 @@
 using System.Collections.Generic;
 using System.Numerics;
 using System.Threading.Tasks;
-using AssettoServer.Network.ClientMessages;
 using AssettoServer.Server.Ai;
 using AssettoServer.Server.Ai.Splines;
 using AssettoServer.Server.Configuration;
-using AssettoServer.Server.Configuration.Extra;
 using AssettoServer.Shared.Model;
 using AssettoServer.Shared.Network.Packets.Incoming;
 using AssettoServer.Shared.Network.Packets.Outgoing;
@@ -21,7 +19,7 @@ namespace AssettoServer.Server;
 public partial class EntryCar : IEntryCar<ACTcpClient>
 { 
     public ACTcpClient? Client { get; internal set; }
-    public CarStatus Status { get; private set; } = new CarStatus();
+    public CarStatus Status { get; private set; } = new();
 
     public bool ForceLights { get; internal set; }
 
@@ -102,34 +100,25 @@ public EntryCar(string model, string? skin, byte sessionId, Func<EntryCar, AiSta
         AiPakSequenceIds = new byte[entryCarManager.EntryCars.Length];
         LastSeenAiState = new AiState[entryCarManager.EntryCars.Length];
         LastSeenAiSpawn = new byte[entryCarManager.EntryCars.Length];
-            
+        
         Logger = new LoggerConfiguration()
             .MinimumLevel.Debug()
             .Enrich.With(new EntryCarLogEventEnricher(this))
             .WriteTo.Logger(Log.Logger)
             .CreateLogger();
-            
+        
+        _sessionManager.SessionChanged += OnSessionChanged;
+        
         AiInit();
     }
 
-    internal void Reset()
+    private void OnSessionChanged(SessionManager sender, SessionChangedEventArgs args)
     {
-        ResetInvoked?.Invoke(this, EventArgs.Empty);
-        IsSpectator = false;
-        SpectatorMode = 0;
-        LastActiveTime = 0;
-        HasUpdateToSend = false;
-        TimeOffset = 0;
-        LastRemoteTimestamp = 0;
-        LastPingTime = 0;
-        Ping = 0;
-        ForceLights = false;
         Status = new CarStatus
         {
             P2PCount = (short)(_configuration.Extra.EnableUnlimitedP2P ? 99 : 15),
             MandatoryPit = _configuration.Server.PitWindowStart < _configuration.Server.PitWindowEnd,
         };
-        TargetCar = null;
 
         Client?.SendPacket(new P2PUpdate
         {
@@ -144,6 +133,29 @@ internal void Reset()
         });
     }
 
+    /// <summary>
+    /// Only call this function to do a clean reset of this EntryCar, e.g. when a player disconnects
+    /// </summary>
+    internal void Reset()
+    {
+        ResetInvoked?.Invoke(this, EventArgs.Empty);
+        IsSpectator = false;
+        SpectatorMode = 0;
+        LastActiveTime = 0;
+        HasUpdateToSend = false;
+        TimeOffset = 0;
+        LastRemoteTimestamp = 0;
+        LastPingTime = 0;
+        Ping = 0;
+        ForceLights = false;
+        Status = new CarStatus
+        {
+            P2PCount = (short)(_configuration.Extra.EnableUnlimitedP2P ? 99 : 15),
+            MandatoryPit = _configuration.Server.PitWindowStart < _configuration.Server.PitWindowEnd,
+        };
+        TargetCar = null;
+    }
+
     internal void SetActive()
     {
         LastActiveTime = _sessionManager.ServerTimeMilliseconds;

AssettoServer/Server/SessionManager.cs

@@ -372,7 +372,6 @@ public void SetSession(int sessionId)
         foreach (var entryCar in _entryCarManager.EntryCars)
         {
             CurrentSession.Results?.Add(entryCar.SessionId, new EntryCarResult(entryCar.Client));
-            entryCar.Reset();
         }
 
         var sessionLength = CurrentSession.Configuration switch