Refactor admin and server loading timing logic

Adjusted timers for admin and server data loading to improve reliability and reduce delays. Admin data is now loaded more promptly on map changes and during command execution. ServerManager now initializes the cache after setting the server ID, and redundant admin reloads have been removed. Version bumped to 1.7.8-beta-10.

Author: daffyyyy

CS2-SimpleAdmin/CS2-SimpleAdmin.cs

@@ -22,7 +22,7 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
     public override string ModuleName => "CS2-SimpleAdmin" + (Helper.IsDebugBuild ? " (DEBUG)" : " (RELEASE)");
     public override string ModuleDescription => "Simple admin plugin for Counter-Strike 2 :)";
     public override string ModuleAuthor => "daffyy";
-    public override string ModuleVersion => "1.7.8-beta-9";
+    public override string ModuleVersion => "1.7.8-beta-10";
 
     public override void Load(bool hotReload)
     {
@@ -83,9 +83,9 @@ public override void OnAllPluginsLoaded(bool hotReload)
             Unload(false);
         }
 
-        AddTimer(6.0f, () => ReloadAdmins(null));
         RegisterEvents();
         AddTimer(0.5f, RegisterCommands.InitializeCommands);
+        AddTimer(1.0f, () => ReloadAdmins(null));
 
         if (!CoreConfig.UnlockConCommands)
         {

CS2-SimpleAdmin/Commands/basecommands.cs

@@ -512,11 +512,11 @@ await Server.NextWorldUpdateAsync(() =>
                 AddTimer(1, () =>
                 {
                     if (!string.IsNullOrEmpty(adminsFile))
-                        AddTimer(2.0f, () => AdminManager.LoadAdminData(ModuleDirectory + "/data/admins.json"));
+                        AdminManager.LoadAdminData(ModuleDirectory + "/data/admins.json");
                     if (!string.IsNullOrEmpty(groupsFile))
-                        AddTimer(3.0f, () => AdminManager.LoadAdminGroups(ModuleDirectory + "/data/groups.json"));
+                        AdminManager.LoadAdminGroups(ModuleDirectory + "/data/groups.json");
                     if (!string.IsNullOrEmpty(adminsFile))
-                        AddTimer(4.0f, () => AdminManager.LoadAdminData(ModuleDirectory + "/data/admins.json"));
+                        AdminManager.LoadAdminData(ModuleDirectory + "/data/admins.json");
 
                     _logger?.LogInformation("Loaded admins!");
                 });

CS2-SimpleAdmin/Events.cs

@@ -448,13 +448,13 @@ public HookResult OnCommandTeamSay(CCSPlayerController? player, CommandInfo info
 
     private void OnMapStart(string mapName)
     {
-        if (!ServerLoaded || ServerId == null)
-            AddTimer(2.0f, OnGameServerSteamAPIActivated);
-
         if (Config.OtherSettings.ReloadAdminsEveryMapChange && ServerLoaded && ServerId != null)
-            AddTimer(5.0f, () => ReloadAdmins(null));
+            ReloadAdmins(null);
 
         AddTimer(1.0f, ServerManager.CheckHibernationStatus);
+        
+        if (!ServerLoaded || ServerId == null)
+            AddTimer(1.5f, OnGameServerSteamAPIActivated);
 
         // AddTimer(34, () =>
         // {

CS2-SimpleAdmin/Managers/ServerManager.cs

@@ -31,7 +31,7 @@ public static void CheckHibernationStatus()
     /// </summary>
     public void LoadServerData()
     {
-        CS2_SimpleAdmin.Instance.AddTimer(2.0f, () =>
+        CS2_SimpleAdmin.Instance.AddTimer(1.0f, () =>
         {
             if (CS2_SimpleAdmin.ServerLoaded || CS2_SimpleAdmin.DatabaseProvider == null) return;
 
@@ -103,14 +103,12 @@ await connection.ExecuteAsync(
                     CS2_SimpleAdmin.ServerId = serverId;
                     CS2_SimpleAdmin._logger?.LogInformation("Loaded server with ip {ip}", ipAddress);
 
-                    if (CS2_SimpleAdmin.ServerId != null)
+                    if (CS2_SimpleAdmin.Instance.CacheManager != null)
                     {
-                        await Server.NextWorldUpdateAsync(() => CS2_SimpleAdmin.Instance.ReloadAdmins(null));
+                        await CS2_SimpleAdmin.Instance.CacheManager.InitializeCacheAsync();
                     }
-
+                    
                     CS2_SimpleAdmin.ServerLoaded = true;
-                    if (CS2_SimpleAdmin.Instance.CacheManager != null)
-                        await CS2_SimpleAdmin.Instance.CacheManager.InitializeCacheAsync();
                 }
                 catch (Exception ex)
                 {

CS2-SimpleAdmin/VERSION

@@ -1 +1 @@
-1.7.8-beta-9
+1.7.8-beta-10