Move checking code for BlacklistedRange to the right place in sqlite (s…

…pace-wizards#29389)
Tayrtahn · Jul 4, 2024 · 8e05e1c · 8e05e1c
1 parent bc7c121
commit 8e05e1c
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/Content.Server/Database/ServerDbSqlite.cs b/Content.Server/Database/ServerDbSqlite.cs
@@ -131,6 +131,10 @@ private static async Task<List<ServerBan>> GetAllBans(
 
             if (exemptFlags is { } exempt)
             {
+                // Any flag to bypass BlacklistedRange bans.
+                if (exempt != ServerBanExemptFlags.None)
+                    exempt |= ServerBanExemptFlags.BlacklistedRange;
+
                 query = query.Where(b => (b.ExemptFlags & exempt) == 0);
             }
 
@@ -144,15 +148,12 @@ private static bool BanMatches(ServerBan ban,
             ServerBanExemptFlags? exemptFlags,
             bool newPlayer)
         {
-            // Any flag to bypass BlacklistedRange bans.
-            var exemptFromBlacklistedRange = exemptFlags != null && exemptFlags.Value != ServerBanExemptFlags.None;
-
             if (!exemptFlags.GetValueOrDefault(ServerBanExemptFlags.None).HasFlag(ServerBanExemptFlags.IP)
                 && address != null
                 && ban.Address is not null
                 && address.IsInSubnet(ban.Address.ToTuple().Value)
                 && (!ban.ExemptFlags.HasFlag(ServerBanExemptFlags.BlacklistedRange) ||
-                     newPlayer && !exemptFromBlacklistedRange))
+                     newPlayer))
             {
                 return true;
             }