small cleanup

compujuckel · Jun 4, 2024 · da0c8fa · da0c8fa
1 parent 1186416
commit da0c8fa
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/AssettoServer/Commands/Modules/GeneralModule.cs b/AssettoServer/Commands/Modules/GeneralModule.cs
@@ -50,8 +50,7 @@ public void AdminAsync(string password)
     {
         if (_configuration.Server.CheckAdminPassword(password))
         {
-            Client!.IsAdministrator = true;
-            Client!.SendAdminAuthorized();
+            Client!.LoginAsAdministrator();
             Reply("You are now Admin for this server");
         }
         else

diff --git a/AssettoServer/Network/Tcp/ACTcpClient.cs b/AssettoServer/Network/Tcp/ACTcpClient.cs
@@ -141,7 +141,7 @@ public class ACTcpClient : IClient
     /// <summary>
     /// Fires when a player has authorized for admin permissions.
     /// </summary>
-    public event EventHandler<ACTcpClient, EventArgs>? AdminAuthorized;
+    public event EventHandler<ACTcpClient, EventArgs>? LoggedInAsAdministrator;
 
     private class ACTcpClientLogEventEnricher : ILogEventEnricher
     {
@@ -951,9 +951,12 @@ public void SendTeleportCarPacket(Vector3 position, Vector3 direction, Vector3 v
         });
     }
 
-    internal void SendAdminAuthorized()
+    internal void LoginAsAdministrator()
     {
-        AdminAuthorized?.Invoke(this, EventArgs.Empty);
+        if (IsAdministrator) return;
+
+        IsAdministrator = true;
+        LoggedInAsAdministrator?.Invoke(this, EventArgs.Empty);
     }
 
     /// <summary>

diff --git a/AssettoServer/Server/Configuration/ACServerConfiguration.cs b/AssettoServer/Server/Configuration/ACServerConfiguration.cs
@@ -90,9 +90,12 @@ public ACServerConfiguration(string? preset, ConfigurationLocations locations, b
         {
             CSPTrackOptions = parsedTrackOptions;
         }
+
         if (CSPTrackOptions.MinimumCSPVersion.HasValue)
+        {
             Log.Debug("Using minimum required CSP Version {Version}", CSPTrackOptions.MinimumCSPVersion.Value);
-
+        }
+
         FullTrackName = string.IsNullOrEmpty(Server.TrackConfig) ? Server.Track : $"{Server.Track}-{Server.TrackConfig}";
         DrsZones = LoadDrsZones(locations.DrsZonePath(CSPTrackOptions.Track, Server.TrackConfig), Extra.EnableGlobalDrs);
 

diff --git a/AutoModerationPlugin/AutoModerationPlugin.cs b/AutoModerationPlugin/AutoModerationPlugin.cs
@@ -59,15 +59,15 @@ public AutoModerationPlugin(AutoModerationConfiguration configuration,
         {
             _entryCarManager.ClientConnected += (sender, _) => sender.FirstUpdateSent += OnFirstUpdateSent;
         }
-        _entryCarManager.ClientConnected += (sender, _) => sender.AdminAuthorized += OnAdminAuthorized;
+        _entryCarManager.ClientConnected += (sender, _) => sender.LoggedInAsAdministrator += OnAdminLoggedIn;
     }
 
     private void OnFirstUpdateSent(ACTcpClient sender, EventArgs args)
     {
         _instances[sender.SessionId].SetActive();
     }
 
-    private void OnAdminAuthorized(ACTcpClient sender, EventArgs args)
+    private void OnAdminLoggedIn(ACTcpClient sender, EventArgs args)
     {
         _instances[sender.SessionId].AdminReset();
     }