Update VERSION

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.

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-7";
+    public override string ModuleVersion => "1.7.8-beta-10b";
     
     public override void Load(bool hotReload)
     {
@@ -83,9 +83,9 @@ public partial class CS2_SimpleAdmin : BasePlugin, IPluginConfig<CS2_SimpleAdmin
             Unload(false);
         }
 
-        AddTimer(6.0f, () => ReloadAdmins(null));
         RegisterEvents();
         AddTimer(0.5f, RegisterCommands.InitializeCommands);
+        AddTimer(1.0f, () => ReloadAdmins(null));
 
         if (!CoreConfig.UnlockConCommands)
         {

CS2-SimpleAdmin/CS2-SimpleAdmin.csproj

@@ -19,16 +19,16 @@
 </PropertyGroup>
 
     <ItemGroup>
-    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.346">
+    <PackageReference Include="CounterStrikeSharp.API" Version="1.0.361">
       <PrivateAssets>none</PrivateAssets>
       <ExcludeAssets>runtime</ExcludeAssets>
       <IncludeAssets>compile; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
         <PackageReference Include="Dapper" Version="2.1.66" />
-    <PackageReference Include="MySqlConnector" Version="2.5.0-beta.1" />
+    <PackageReference Include="MySqlConnector" Version="2.5.0" />
     <PackageReference Include="System.Data.SQLite.Core" Version="1.0.119" />
-    <PackageReference Include="System.Linq.Async" Version="7.0.0-preview.1.g24680b5469" />
-    <PackageReference Include="ZLinq" Version="1.5.3" />
+    <PackageReference Include="System.Linq.Async" Version="7.0.0" />
+    <PackageReference Include="ZLinq" Version="1.5.4" />
   </ItemGroup>
 
   <ItemGroup>

CS2-SimpleAdmin/Commands/basecommands.cs

@@ -507,7 +507,7 @@ public partial class CS2_SimpleAdmin
             var adminsFile = await File.ReadAllTextAsync(Instance.ModuleDirectory + "/data/admins.json");
             var groupsFile = await File.ReadAllTextAsync(Instance.ModuleDirectory + "/data/groups.json");
             
-            await Server.NextWorldUpdateAsync(() =>
+               await Server.NextWorldUpdateAsync(() =>
             {
                 AddTimer(1, () =>
                 {
@@ -521,7 +521,7 @@ public partial class CS2_SimpleAdmin
                     _logger?.LogInformation("Loaded admins!");
                 });
             });
-        });
+        });  
 
         //_ = _adminManager.GiveAllGroupsFlags();
         //_ = _adminManager.GiveAllFlags();

CS2-SimpleAdmin/Events.cs

@@ -448,13 +448,13 @@ public partial class CS2_SimpleAdmin
 
     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/CacheManager.cs

@@ -620,47 +620,40 @@ internal class CacheManager: IDisposable
         if (CS2_SimpleAdmin.Instance.Config.OtherSettings.BanType == 0 || string.IsNullOrEmpty(ipAddress))
             return false;
 
-        if (!_playerIpsCache.TryGetValue(steamId, out var ipData))
+        if (!IpHelper.TryConvertIpToUint(ipAddress, out var ipUInt))
             return false;
 
-        var cutoff = Time.ActualDateTime().AddDays(-CS2_SimpleAdmin.Instance.Config.OtherSettings.ExpireOldIpBans);
+        if (_cachedIgnoredIps.Contains(ipUInt))
+            return false;
+
+        if (!_ipIndex.TryGetValue(ipUInt, out var ipBanRecords))
+            return false;
+
+        var ipBan = ipBanRecords.FirstOrDefault(r => r.StatusEnum == BanStatus.ACTIVE);
+        if (ipBan == null)
+            return false;
+
+        if (!_banCache.TryGetValue(ipBan.Id, out var cachedIpBan) || cachedIpBan.StatusEnum != BanStatus.ACTIVE)
+            return false;
+
+        var expireOldIpBans = CS2_SimpleAdmin.Instance.Config.OtherSettings.ExpireOldIpBans;
+        if (expireOldIpBans > 0)
+        {
+            var cutoff = Time.ActualDateTime().AddDays(-expireOldIpBans);
+            if (ipBan.Created < cutoff)
+                return false;
+        }
+
         var unknownName = CS2_SimpleAdmin._localizer?["sa_unknown"] ?? "Unknown";
 
-        if (ipAddress != null && IpHelper.TryConvertIpToUint(ipAddress, out var ipAsUint))
-        {
-            if (!_cachedIgnoredIps.Contains(ipAsUint))
-            {
-                ipData.Add(new IpRecord(ipAsUint, Time.ActualDateTime().AddSeconds(-2), unknownName));
-            }
-        }
+        if (string.IsNullOrEmpty(ipBan.PlayerName))
+            ipBan.PlayerName = playerName;
 
-        foreach (var ipRecord in ipData)
-        {
-            if (ipRecord.UsedAt < cutoff || _cachedIgnoredIps.Contains(ipRecord.Ip))
-                continue;
+        ipBan.PlayerSteamId ??= steamId;
 
-            if (!_ipIndex.TryGetValue(ipRecord.Ip, out var banRecords))
-                continue;
+        _ = Task.Run(() => UpdatePlayerData(playerName, steamId, ipAddress));
 
-            var activeBan = banRecords.FirstOrDefault(r => r.StatusEnum == BanStatus.ACTIVE);
-            if (activeBan == null)
-                continue;
-
-            // Double-check the ban is still active in cache (handle race conditions)
-            if (!_banCache.TryGetValue(activeBan.Id, out var cachedBan) || cachedBan.StatusEnum != BanStatus.ACTIVE)
-                continue;
-
-            if (string.IsNullOrEmpty(activeBan.PlayerName))
-                activeBan.PlayerName = unknownName;
-
-            activeBan.PlayerSteamId ??= steamId;
-
-            _ = Task.Run(() => UpdatePlayerData(playerName, steamId, ipAddress));
-
-            return true;
-        }
-
-        return false;
+        return true;
     }
 
     /// <summary>

CS2-SimpleAdmin/Managers/ServerManager.cs

@@ -31,7 +31,7 @@ public class ServerManager
     /// </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 @@ public class ServerManager
                     CS2_SimpleAdmin.ServerId = serverId;
                     CS2_SimpleAdmin._logger?.LogInformation("Loaded server with ip {ip}", ipAddress);
 
-                    if (CS2_SimpleAdmin.ServerId != null)
-                    {
-                        await Server.NextWorldUpdateAsync(() => CS2_SimpleAdmin.Instance.ReloadAdmins(null));
-                    }
+CS2_SimpleAdmin.ServerLoaded = true;
 
-                    CS2_SimpleAdmin.ServerLoaded = true;
                     if (CS2_SimpleAdmin.Instance.CacheManager != null)
+                    {
                         await CS2_SimpleAdmin.Instance.CacheManager.InitializeCacheAsync();
+                    }
                 }
                 catch (Exception ex)
                 {

CS2-SimpleAdmin/Models/BanRecord.cs

@@ -24,7 +24,10 @@ public record BanRecord
     
     [Column("player_ip")]
     public string? PlayerIp { get; set; }
-    
+
+    [Column("created")]
+    public DateTime Created { get; init; }
+
     [Column("status")]
     public required string Status { get; init; }
 

CS2-SimpleAdmin/VERSION

@@ -1 +1 @@
-1.7.8-beta-7
+1.7.8-beta-10b

CS2-SimpleAdminApi/CS2-SimpleAdminApi.csproj

@@ -9,7 +9,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <PackageReference Include="CounterStrikeSharp.API" Version="1.0.346" />
+      <PackageReference Include="CounterStrikeSharp.API" Version="1.0.361" />
     </ItemGroup>
 
 </Project>