test(objects): skip weapon-itemID assertion when TileData is absent

ExtractLean clamps itemID > TileData.MaxItemValue to 1; MaxItemValue is 0 when
tiledata.mul is missing (CI), so Katana's 0x13FF only survives with client data.
Guard with [SkippableFact] + TileDataRequirement.SkipIfMissing() like other
data-dependent tests. The hue/cliloc assertion needs no data and stays a [Fact].

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "modernuoschemagenerator": {
-      "version": "4.0.0",
+      "version": "2.14.3",
       "commands": [
         "ModernUOSchemaGenerator"
       ]

.github/workflows/build-test.yml

@@ -40,13 +40,13 @@ jobs:
       with:
         fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
     - name: Install .NET
-      uses: actions/setup-dotnet@v6
+      uses: actions/setup-dotnet@v5
       with:
         global-json-file: global.json
     - name: Install Prerequisites
       run: |
         brew update
-        brew install icu4c libdeflate argon2
+        brew install icu4c libdeflate zstd argon2
     - name: Set Library Path
       run: echo "DYLD_LIBRARY_PATH=/opt/homebrew/lib:$DYLD_LIBRARY_PATH" >> $GITHUB_ENV
     - name: Build
@@ -64,7 +64,7 @@ jobs:
         fi
     - name: Upload test results on failure
       if: failure()
-      uses: actions/upload-artifact@v7
+      uses: actions/upload-artifact@v4
       with:
         name: TestResults-${{ matrix.name }}
         path: ./TestResults
@@ -124,41 +124,17 @@ jobs:
           dnf config-manager --set-enabled crb
           dnf install -y epel-release
         if: ${{ matrix.epel }}
-      # Runtime packages only, deliberately. Installing the -dev packages here would add the
-      # unversioned .so symlink and mask the very thing the binding packages now probe for, so a
-      # regression in versioned-SONAME resolution would sail through CI.
       - name: Install Prerequisites using dnf
-        run: dnf makecache --refresh && dnf install -y findutils libicu libdeflate libargon2 tzdata
+        run: dnf makecache --refresh && dnf install -y findutils libicu libdeflate-devel zstd libargon2-devel liburing-devel
         if: ${{ matrix.packageManager == 'dnf' }}
-      # ICU's runtime package carries the ABI version in its name (libicu70 on jammy, libicu76 on
-      # trixie) and has no stable alias, so match it by pattern. libicu-dev was the old way to stay
-      # version-independent, but it drags in the unversioned symlink and defeats the check below.
       - name: Install Prerequisites using apt
-        run: apt-get update -y && apt-get install -y curl '^libicu[0-9]+$' libdeflate0 libargon2-1 tzdata
+        run: apt-get update -y && apt-get install -y curl libicu-dev libdeflate-dev zstd libargon2-dev tzdata liburing-dev
         if: ${{ matrix.packageManager == 'apt' }}
-      # Versioned-SONAME resolution is only under test while the unversioned symlink is absent. If a
-      # base image or a package ever starts shipping it, every probe would succeed on the first try
-      # and a regression in the fallback would sail through CI, so fail loudly instead of silently
-      # testing nothing.
-      - name: Assert the unversioned .so symlinks are absent
-        run: |
-          found=""
-          for lib in libicuuc libicui18n libdeflate libargon2; do
-            hit=$(ls /usr/lib/*/"$lib".so /usr/lib64/"$lib".so 2>/dev/null || true)
-            if [ -n "$hit" ]; then
-              found="$found $hit"
-            fi
-          done
-          if [ -n "$found" ]; then
-            echo "::error::Unversioned symlinks present, so CI is no longer exercising versioned SONAME resolution:$found"
-            exit 1
-          fi
-          echo "No unversioned symlinks present; versioned SONAME resolution is under test."
       - uses: actions/checkout@v7
         with:
           fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
       - name: Install .NET
-        uses: actions/setup-dotnet@v6
+        uses: actions/setup-dotnet@v5
         with:
           global-json-file: global.json
       - name: Build
@@ -174,7 +150,7 @@ jobs:
           fi
       - name: Upload test results on failure
         if: failure()
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v4
         with:
           name: TestResults-${{ matrix.name }}
           path: ./TestResults

.github/workflows/build-tool-release.yml

@@ -37,7 +37,7 @@ jobs:
           fetch-depth: 0 # Full clone required for Nerdbank.GitVersioning
 
       - name: Install .NET
-        uses: actions/setup-dotnet@v6
+        uses: actions/setup-dotnet@v5
         with:
           global-json-file: global.json
 

.github/workflows/create-release.yml

@@ -15,7 +15,7 @@ jobs:
         fetch-depth: 0 # avoid shallow clone so nbgv can do its work.
         token: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
     - name: Install .NET
-      uses: actions/setup-dotnet@v6
+      uses: actions/setup-dotnet@v5
       with:
         global-json-file: global.json
     - name: Compute version

.gitignore

@@ -9,30 +9,16 @@
 /Distribution/bsdtar
 /Distribution/Configuration/antimacro.json
 /Distribution/Configuration/assistants.json
-/Distribution/Configuration/auto-denylist.json
-/Distribution/Configuration/bans.json
-/Distribution/Configuration/blocklist.json
-/Distribution/Configuration/crowdsec.json
 /Distribution/Configuration/expansion.json
-/Distribution/Configuration/firewall.json
-/Distribution/Configuration/ip-allowlist*.txt
-/Distribution/Configuration/ip-allowlist*.txt.tmp
-/Distribution/Configuration/ip-blocklist.txt
-/Distribution/Configuration/ip-blocklist.txt.tmp
-/Distribution/Configuration/login-allowlist.json
-/Distribution/Configuration/login-allowlist.txt
-/Distribution/Configuration/login-allowlist.txt.tmp
 /Distribution/Configuration/modernuo.json
 /Distribution/Configuration/email-settings.json
 /Distribution/Configuration/throttles.json
 /Distribution/Configuration/tot.json
-/Distribution/Data/Pathfinding
 /Distribution/Logs
 /Distribution/Archives
 /Distribution/Backups
 /Distribution/Saves
 /Distribution/docs
-/docs/
 /Distribution/temp
 /Distribution/*.dylib
 /Distribution/*.so
@@ -60,7 +46,5 @@
 /packages/*
 /Distribution/Configuration/server-access.json
 
-# BuildTool native binaries (downloaded from GitHub Releases).
+# BuildTool native binaries (downloaded from GitHub Releases)
-# Ignore everything under tools/ except the operator scripts checked in below.
+/tools/
-/tools/*
-!/tools/Export-IpBlocklist.ps1

CLAUDE.md

@@ -12,14 +12,14 @@ Apply these when writing or reviewing `.cs` files under `Projects/`.
 
 1. **LINQ** — Tier 1 (zero-cost patterns) free on hot paths; Tier 2 (low overhead) OK on warm paths; Tier 3 (allocating) forbidden on hot paths → `dev-docs/code-standards.md`
 2. **No `Console.WriteLine`** — use `LogFactory.GetLogger(typeof(MyClass))` → `logger.Information(...)` (requires `using Server.Logging;`)
-3. **Threading policy** — game logic runs only on the main loop; **never** touch game state (`World`, mobiles, items, maps, timers) from a background thread. Heavy work that *needs* game state must be **chunked** across ticks, not threaded. Heavy work that does *not* need game state (large-file parse, external I/O) **must** run on a background thread **and must yield to world saves** (defer while `World.Saving`/`WorldState.PendingSave`). Publish results back to the loop as an immutable snapshot swapped via a single `volatile` reference — the only sanctioned `volatile`. No `lock`/`Mutex`/`ConcurrentDictionary` in game logic. Rule #10 covers how background work hands results back to the loop → `dev-docs/threading-model.md`
+3. **No concurrency primitives** — no `lock`, `volatile`, `ConcurrentDictionary`, `Mutex`, etc. Server is single-threaded.
 4. **No `World.Mobiles`/`World.Items` iteration** — use spatial queries: `map.GetMobilesInRange<T>()`, `map.GetItemsInRange<T>()`
 5. **Clean up refs in `OnDelete()`/`OnAfterDelete()`** — null out `Item`/`Mobile` references
 6. **Cancel timers in `OnDelete()`/`OnAfterDelete()`** — call `_token.Cancel()` or `_timer?.Stop()`
 7. **`STArrayPool<T>.Shared`** not `ArrayPool<T>.Shared` — single-threaded optimized, no locks
 8. **`PooledRefList<T>`** not `new List<T>()` on hot paths — zero GC pressure, stack-allocated ref struct
-9. **Serialization** — class must be `partial`, constructor needs `[Constructible]`, `TimerExecutionToken` must NOT have `[SerializableField]`. New classes: use `[SerializationGenerator(version)]` (omit `encoded`). Setters that coerce/veto/run side effects: use `[SerializableField]` args `allowFieldChange: nameof(BoolRefMethod)` / `fieldChanged: nameof(OldNewMethod)` — reserve `[SerializableProperty]` for custom getters. Serializable `Timer` members declare `[DeserializeTimer(nameof(Method))]` on the field (anchored by default — downtime preserves remaining delay; `wallClock: true` = absolute; method runs only when a timer was running at save). Conditional writes: `[SaveFlag(nameof(Should), nameof(Default))]` on the field. When bumping versions, add `MigrateFrom(VXContent)` (X = previous version). Never modify `Deserialize(reader, version)` for version bumps — that method is only for pre-codegen legacy saves. When migrating from pre-codegen Serialize/Deserialize: pass `false` if old code used `reader.ReadInt()`, bump version +1, and keep old logic as `private void Deserialize(IGenericReader reader, int version)` → `dev-docs/serialization.md`, `dev-docs/runuo-migration-docs/02-serialization.md`
+9. **Serialization** — class must be `partial`, constructor needs `[Constructible]`, `TimerExecutionToken` must NOT have `[SerializableField]`. New classes: use `[SerializationGenerator(version)]` (omit `encoded`). When bumping versions, add `MigrateFrom(VXContent)` (X = previous version). Never modify `Deserialize(reader, version)` for version bumps — that method is only for pre-codegen legacy saves. When migrating from pre-codegen Serialize/Deserialize: pass `false` if old code used `reader.ReadInt()`, bump version +1, and keep old logic as `private void Deserialize(IGenericReader reader, int version)` → `dev-docs/runuo-migration-docs/02-serialization.md`
-10. **No `Task.Run`/`new Thread()` for game logic** (tandem with rule #3) — game logic is the single-threaded event loop. Backgrounding is allowed only for work that does not itself touch game state (external service calls, large-file parse). **Prove the need before adding a thread**: measure **on-loop** time, not wall-clock (frozen world is the cost, player latency is not), and gate on `Environment.ProcessorCount` — off-loading creates no CPU and buys nothing on 1–2 cores. New workers go in the vetted table in `dev-docs/threading-model.md` with their measurement. When such work must *feed* game logic: run the heavy/I/O part off-loop and `ConfigureAwait(false)` its awaits so a continuation never resumes on the loop and silently foregrounds heavy work; then hand the result back **explicitly** — publish an immutable snapshot swapped via a `volatile` reference (the loop reads it lock-free), or marshal the apply step with `Core.LoopContext.Post(() => …)`, re-validating in the continuation whatever may have changed while it ran. Never touch game state off-thread; never let the scheduler decide where the heavy work runs → `dev-docs/threading-model.md`
+10. **No `Task.Run`/`new Thread()`** in game code — game logic is single-threaded event loop
 11. **Never assume era** — if code uses `Core.AOS`/`Core.SE`/etc., ask which expansion to target
 12. **Naming** — `_camelCase` private fields, `PascalCase` properties/methods/classes; don't flag legacy `m_` but use `_` for new code
 13. **No empty gumps** — every gump must produce visual elements. An empty gump leaks on client+server (no way to close it). Use static `DisplayTo()` to validate before constructing → `dev-docs/gump-system.md`
@@ -28,8 +28,6 @@ Apply these when writing or reviewing `.cs` files under `Projects/`.
 16. **Prefer switch expressions and switch-when** — use switch expressions for value mapping and switch-when for pattern matching where they improve readability. Exception: skip if unreadable or cold path → `dev-docs/code-standards.md`
 17. **No `System.Text.StringBuilder`** — use `ValueStringBuilder` with `stackalloc` (bounded output) or `ValueStringBuilder.Create()` (unbounded). Supports `$"..."` interpolation directly. Always use `using var` for disposal. Use `Reset()` instead of reassigning → `dev-docs/string-handling.md`
 18. **Interpolation anti-patterns on handler-aware APIs** — `Send*`/`Say`/`Emote`/`PublicOverhead*`/`IPropertyList.Add`/gump `AddLabel`/`AddHtml`/`Html.Center`/`SpanWriter.Write*` all have `ref RawInterpolatedStringHandler` overloads that allocate zero strings, but only when the call-site argument is a `$"..."` literal directly. Avoid: ternaries with interpolated branches (`Send(c ? $"a" : $"b")`), switch expressions with interpolated arms, pre-built `var s = $"..."` locals (single-use), `.ToString()` / `.String()` / `string.Format` inside holes, string concat (`{a + b}`), LINQ string ops in holes. Use `:L` format spec for lowercase (`{rank:L}` not `rank.ToString().ToLowerInvariant()`) → `dev-docs/string-handling.md` § Interpolation Anti-Patterns
-19. **No `InvalidateProperties()` from inside `GetProperties`** — every property a `GetProperties` override reads must be a pure read. `InvalidateProperties()` rebuilds the list in place (`Reset()` + rebuild), and `Reset()` returns the pooled interpolation buffer — which the compiler rents for the whole `$"..."` expression, so every hole is evaluated while it is live — and rewinds the packet cursor. A getter that invalidates therefore throws `ArgumentNullException` (parameter `"array"`) out of `GetProperties` from an unrelated-looking line, or silently corrupts the tooltip. The engine refuses and logs an error; `DEBUG` throws. Lazy recomputation in a getter is fine — the *notification* is not. Invalidate in the setter that changes the value, or defer with `Timer.DelayCall(InvalidateProperties)` → `dev-docs/property-lists.md` § Never Invalidate From Inside `GetProperties`
-20. **Tick-count math must be wraparound-safe** — compare `Core.TickCount`/`GetTimestamp()` values only by subtraction (`a - b < 0`, never `a < b`), no zero/sign sentinels on tick fields, seed deadline fields from a real tick (never rely on the 0 default). Cloud hypervisors (GCP) pass through the host's never-resetting counter: ticks start enormous and can wrap negative. Linux affected in production; Windows not so far → `dev-docs/tick-counts.md`
 
 ## Dev-Docs Reference
 
@@ -46,14 +44,9 @@ Apply these when writing or reviewing `.cs` files under `Projects/`.
 | Commands & targeting | `dev-docs/commands-targeting.md` |
 | Event system | `dev-docs/events.md` |
 | Threading model | `dev-docs/threading-model.md` |
-| Server hardware requirements | `dev-docs/server-requirements.md` |
-| Debugging event-loop performance (profiling build, decomposition, GC/RAM) | `dev-docs/debugging-event-loop.md` |
-| Tick-count overflow rules (subtraction comparisons; GCP pass-through counters) | `dev-docs/tick-counts.md` |
 | Server lifecycle & bootstrap phases (Configure/ConfigurePrompts/Initialize) | `dev-docs/server-lifecycle.md` |
-| Platform prerequisites (ICU, tzdata, native libs per distro) | `dev-docs/platform-prerequisites.md` |
 | Configuration system | `dev-docs/configuration.md` |
 | Networking & packets | `dev-docs/networking-packets.md` |
-| IP bans, blocklists & allowlists (incl. unblocking a player) | `dev-docs/ip-bans-and-allowlists.md` |
 | Region system | `dev-docs/regions.md` |
 | String handling & ValueStringBuilder | `dev-docs/string-handling.md` |
 | RunUO migration (overview) | `dev-docs/runuo-migration-docs/00-overview.md` |
@@ -99,18 +92,7 @@ Then copy only the relevant skill files based on the task:
 | Migrate persistence (WorldSave) | `migrate-from-runuo/migrate-persistence` |
 | Migrate multi-file system | `migrate-from-runuo/migrate-systems` |
 
-To enable a skill — Claude Code loads `.claude/skills/<name>/SKILL.md`; a bare `.md` dropped
+To enable a skill: `cp dev-docs/claude-skills/<name>.md .claude/skills/`
-directly into `.claude/skills/` is **not** picked up, and newly installed skills appear in the
-*next* session:
-
-```sh
-# Standard skills (modernuo-*)
-mkdir -p .claude/skills/<name> && cp dev-docs/claude-skills/<name>.md .claude/skills/<name>/SKILL.md
-
-# Migration skills — sources live in the migrate-from-runuo/ subfolder, but install under the
-# bare skill name (the table's "migrate-from-runuo/<name>" is the source path, not the name):
-mkdir -p .claude/skills/<name> && cp dev-docs/claude-skills/migrate-from-runuo/<name>.md .claude/skills/<name>/SKILL.md
-```
 
 Migration skills reference the deep docs in `dev-docs/runuo-migration-docs/` and point to existing ModernUO skills for best practices.
 

Directory.Build.props

@@ -63,15 +63,8 @@
         <CodeAnalysisRuleSet>..\..\Rules.ruleset</CodeAnalysisRuleSet>
         <AnalysisLevel>latest</AnalysisLevel>
     </PropertyGroup>
-    <!-- Event-loop time accounting, compiled out unless requested:
-         dotnet build -p:EventLoopProfiling=true
-         See dev-docs/debugging-event-loop.md. Placed last so it appends to whatever the
-         configuration groups above set DefineConstants to. -->
-    <PropertyGroup Condition="'$(EventLoopProfiling)'=='true'">
-        <DefineConstants>$(DefineConstants);EVENT_LOOP_PROFILING</DefineConstants>
-    </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Serilog" Version="4.4.0" />
+        <PackageReference Include="Serilog" Version="4.3.1" />
         <PackageReference Include="Serilog.Sinks.Async" Version="2.1.0" />
         <PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
         <PackageReference Include="Nerdbank.GitVersioning" Condition="!Exists('packages.config')">

Distribution/Data/npc-speeds.json

@@ -3,16 +3,12 @@
     "level": "VerySlow",
     "active": 0.4,
     "passive": 0.8,
-    "activeMove": 0.9,
-    "passiveMove": 1.5,
     "types": []
   },
   {
     "level": "Slow",
     "active": 0.3,
     "passive": 0.6,
-    "activeMove": 0.6,
-    "passiveMove": 1.2,
     "types": [
       "AntLion", "ArcticOgreLord", "BogThing",
       "Bogle", "BoneKnight", "EarthElemental",
@@ -32,8 +28,6 @@
     "level": "Medium",
     "active": 0.25,
     "passive": 0.5,
-    "activeMove": 0.45,
-    "passiveMove": 1.05,
     "types": [
       "AcidElemental", "AgapiteElemental", "Alligator",
       "AncientLich", "Betrayer", "Bird",
@@ -114,8 +108,6 @@
     "level": "Fast",
     "active": 0.2,
     "passive": 0.4,
-    "activeMove": 0.3,
-    "passiveMove": 0.9,
     "types": [
       "LordOaks", "Silvani", "AirElemental",
       "AncientWyrm", "Balron", "BladeSpirits",
@@ -147,8 +139,6 @@
     "level": "VeryFast",
     "active": 0.125,
     "passive": 0.30,
-    "activeMove": 0.125,
-    "passiveMove": 0.6,
     "types": [
       "Barracoon", "Mephitis", "Neira",
       "Rikktor", "Semidar", "EnergyVortex",

Projects/BuildTool/BuildOptions.cs

@@ -14,11 +14,4 @@ public sealed class BuildOptions
     public string? Arch { get; set; }
     public bool SkipPrereqs { get; set; }
     public bool Interactive { get; set; }
-
-    /// <summary>
-    /// Report the native library prerequisites and exit. The interactive flow is the only other
-    /// path that runs these checks, so without this there is no way to verify a deployment target
-    /// from a script or a container.
-    /// </summary>
-    public bool CheckPrereqsOnly { get; set; }
 }

Projects/BuildTool/BuildTool.csproj

@@ -17,5 +17,6 @@
     </PropertyGroup>
     <ItemGroup>
         <PackageReference Include="Spectre.Console" Version="0.57.2" />
+        <PackageReference Update="Serilog" Version="4.4.0" />
     </ItemGroup>
 </Project>

Projects/BuildTool/Prerequisites/NativeLibraryChecker.cs

@@ -1,4 +1,3 @@
-using System.Runtime.InteropServices;
 using BuildTool.Platform;
 using BuildTool.Publishing;
 
@@ -32,10 +31,8 @@ public static class NativeLibraryChecker
                 "Linux",
                 [
                     ".NET 10 Runtime — https://dotnet.microsoft.com/download/dotnet/10.0",
-                    "Debian/Ubuntu:  sudo apt-get install -y libdeflate0 libargon2-1 libicuNN tzdata",
+                    "Debian/Ubuntu:  sudo apt-get install -y libicu-dev libdeflate-dev zstd libargon2-dev liburing-dev",
-                    "                (libicuNN varies by release, e.g. libicu76 — run build-tool --check-prereqs there for the exact name)",
+                    "Fedora/RHEL:    sudo dnf install -y libicu libdeflate-devel zstd libargon2-devel liburing-devel",
-                    "                (add tzdata-legacy if the shard is configured with an alias such as US/Eastern)",
-                    "Fedora/RHEL:    sudo dnf install -y libdeflate libargon2 libicu tzdata",
                     "CentOS:         Also requires epel-release and CRB enabled"
                 ]
             ),
@@ -179,59 +176,82 @@ public static class NativeLibraryChecker
         return results;
     }
 
-    /// <summary>
-    /// Native libraries the server needs from the system on Linux, and the SONAME range to accept
-    /// for each. Rationale and per-distro package names: dev-docs/platform-prerequisites.md.
-    /// </summary>
-    private static readonly (string Name, int MinSoVersion, int MaxSoVersion)[] _linuxLibraries =
-    [
-        ("libicuuc", 60, 120),
-        ("libicui18n", 60, 120),
-        ("libdeflate", 0, 9),
-        ("libargon2", 0, 9)
-    ];
-
     private static List<PrerequisiteResult> CheckLinux(PlatformInfo platform)
+    {
+        return platform.PackageManager switch
+        {
+            PackageManager.Apt => CheckLinuxApt(),
+            PackageManager.Dnf => CheckLinuxDnf(platform),
+            _ => CheckLinuxGeneric(platform)
+        };
+    }
+
+    private static List<PrerequisiteResult> CheckLinuxApt()
     {
         var results = new List<PrerequisiteResult>();
+        var packages = new[] { "libicu-dev", "libdeflate-dev", "zstd", "libargon2-dev", "liburing-dev" };
         var missing = new List<string>();
 
-        foreach (var (name, minSoVersion, maxSoVersion) in _linuxLibraries)
+        foreach (var package in packages)
         {
-            var found = CanLoad(name, minSoVersion, maxSoVersion);
+            var result = ProcessRunner.RunCaptured("dpkg", $"-l {package}");
+            var installed = result.Success && result.StandardOutput.Contains("ii");
 
-            if (!found)
+            if (!installed)
             {
-                missing.Add(name);
+                missing.Add(package);
             }
 
             results.Add(new PrerequisiteResult
             {
-                Name = name,
+                Name = package,
-                Passed = found,
+                Passed = installed,
-                Details = found ? "Found" : "Not found"
+                Details = installed ? "Installed" : "Not installed"
             });
         }
 
-        var hasTimeZoneData = HasTimeZoneData();
+        if (missing.Count > 0)
-        if (!hasTimeZoneData)
         {
-            missing.Add("tzdata");
+            results.Add(new PrerequisiteResult
+            {
+                Name = "Install all missing",
+                Passed = false,
+                IsWarning = true,
+                Details = "Run the following command to install all missing dependencies:",
+                InstallCommand = $"sudo apt-get install -y {string.Join(' ', missing)}"
+            });
         }
 
-        results.Add(new PrerequisiteResult
+        return results;
-        {
+    }
-            Name = "tzdata",
-            Passed = hasTimeZoneData,
-            Details = hasTimeZoneData ? "Found" : "Not found — every zone except UTC will throw"
-        });
 
-        if (missing.Count == 0)
+    private static List<PrerequisiteResult> CheckLinuxDnf(PlatformInfo platform)
+    {
+        var results = new List<PrerequisiteResult>();
+        var packages = new[] { "libicu", "libdeflate-devel", "zstd", "libargon2-devel", "liburing-devel" };
+        var missing = new List<string>();
+
+        foreach (var package in packages)
         {
-            return results;
+            var result = ProcessRunner.RunCaptured("rpm", $"-q {package}");
+            var installed = result.Success;
+
+            if (!installed)
+            {
+                missing.Add(package);
+            }
+
+            results.Add(new PrerequisiteResult
+            {
+                Name = package,
+                Passed = installed,
+                Details = installed ? "Installed" : "Not installed"
+            });
         }
 
-        if (platform.DistroId?.Equals("centos", StringComparison.OrdinalIgnoreCase) == true)
+        // Check if this is CentOS (needs EPEL)
+        var isCentOs = platform.DistroId?.Equals("centos", StringComparison.OrdinalIgnoreCase) == true;
+        if (isCentOs && missing.Count > 0)
         {
             results.Add(new PrerequisiteResult
             {
@@ -243,131 +263,49 @@ public static class NativeLibraryChecker
             });
         }
 
-        results.Add(new PrerequisiteResult
+        if (missing.Count > 0)
         {
-            Name = "Install all missing",
+            results.Add(new PrerequisiteResult
-            Passed = false,
+            {
-            IsWarning = true,
+                Name = "Install all missing",
-            Details = "Install the missing dependencies. The -dev/-devel packages are not required:",
+                Passed = false,
-            InstallCommand = BuildInstallCommand(platform, missing)
+                IsWarning = true,
-        });
+                Details = "Run the following command to install all missing dependencies:",
+                InstallCommand = $"sudo dnf install -y {string.Join(' ', missing)}"
+            });
+        }
 
         return results;
     }
 
-    /// <summary>
+    private static List<PrerequisiteResult> CheckLinuxGeneric(PlatformInfo platform)
-    /// tzdata is data, not a library, so no loader probe finds it. Asking the runtime rather than
-    /// stat'ing a path keeps TZDIR honoured, and the count is still accurate under
-    /// InvariantGlobalization, which this tool runs with — only display names degrade there.
-    /// </summary>
-    private static bool HasTimeZoneData()
     {
-        try
+        var results = new List<PrerequisiteResult>();
-        {
-            return TimeZoneInfo.GetSystemTimeZones().Count > 1;
-        }
-        catch
-        {
-            return false;
-        }
-    }
 
-    /// <summary>
+        // Use ldconfig to check for shared libraries
-    /// Asks the loader directly rather than querying a package database or scanning ldconfig's
+        var ldResult = ProcessRunner.RunCaptured("ldconfig", "-p");
-    /// cache, both of which answer a different question and can disagree with what dlopen will do.
+        var ldOutput = ldResult.Success ? ldResult.StandardOutput : "";
-    /// Mirrors the binding packages' own probing: the unversioned name first, then libfoo.so.N
-    /// descending. Bare names go through the full loader search path, so LD_LIBRARY_PATH and
-    /// /etc/ld.so.conf.d still apply.
-    /// </summary>
-    private static bool CanLoad(string library, int minSoVersion, int maxSoVersion)
-    {
-        if (TryLoadAndFree($"{library}.so"))
-        {
-            return true;
-        }
 
-        for (var soVersion = maxSoVersion; soVersion >= minSoVersion; soVersion--)
+        var libraries = new Dictionary<string, string>
         {
-            if (TryLoadAndFree($"{library}.so.{soVersion}"))
+            ["libicu"] = "libicuuc",
+            ["libdeflate"] = "libdeflate",
+            ["zstd"] = "libzstd",
+            ["libargon2"] = "libargon2",
+            ["liburing"] = "liburing"
+        };
+
+        foreach (var (name, soName) in libraries)
+        {
+            var found = ldOutput.Contains(soName, StringComparison.OrdinalIgnoreCase);
+            results.Add(new PrerequisiteResult
             {
-                return true;
+                Name = name,
-            }
+                Passed = found,
+                Details = found ? "Found" : "Not found — install using your package manager"
+            });
         }
 
-        return false;
+        return results;
-    }
-
-    private static bool TryLoadAndFree(string candidate)
-    {
-        if (!NativeLibrary.TryLoad(candidate, out var handle))
-        {
-            return false;
-        }
-
-        NativeLibrary.Free(handle);
-        return true;
-    }
-
-    private static string BuildInstallCommand(PlatformInfo platform, List<string> missing)
-    {
-        switch (platform.PackageManager)
-        {
-            case PackageManager.Apt:
-                {
-                    // Distinct because the two ICU libraries resolve to the same package, and
-                    // ResolveAptIcuPackage shells out, so it is memoized rather than called per name.
-                    var packages = missing.Select(
-                        library => library switch
-                        {
-                            "libdeflate" => "libdeflate0",
-                            "libargon2"  => "libargon2-1",
-                            "tzdata"     => "tzdata",
-                            _            => _aptIcuPackage ??= ResolveAptIcuPackage()
-                        }
-                    ).Distinct();
-
-                    return $"sudo apt-get install -y {string.Join(' ', packages)}";
-                }
-            case PackageManager.Dnf:
-                {
-                    var packages = missing.Select(
-                        library => library switch
-                        {
-                            "libdeflate" => "libdeflate",
-                            "libargon2"  => "libargon2",
-                            "tzdata"     => "tzdata",
-                            _            => "libicu"
-                        }
-                    ).Distinct();
-
-                    return $"sudo dnf install -y {string.Join(' ', packages)}";
-                }
-            default:
-                return $"Install your distribution's runtime packages for: {string.Join(", ", missing)}";
-        }
-    }
-
-    private static string _aptIcuPackage;
-
-    /// <summary>
-    /// ICU's apt package carries the ABI version in its name and there is no stable alias, so ask
-    /// apt which one this release actually ships instead of printing a name that rots.
-    /// </summary>
-    private static string ResolveAptIcuPackage()
-    {
-        var result = ProcessRunner.RunCaptured("apt-cache", "search --names-only ^libicu[0-9]+$");
-        if (!result.Success)
-        {
-            return "libicu";
-        }
-
-        var best = result.StandardOutput
-            .Split('\n', StringSplitOptions.RemoveEmptyEntries)
-            .Select(line => line.Split(' ', 2)[0].Trim())
-            .Where(name => name.StartsWith("libicu", StringComparison.Ordinal))
-            .OrderBy(name => int.TryParse(name.AsSpan(6), out var version) ? version : 0)
-            .LastOrDefault();
-
-        return best ?? "libicu";
     }
 }

Projects/BuildTool/Program.cs

@@ -4,7 +4,6 @@ using BuildTool.Interactive;
 using BuildTool.Platform;
 using BuildTool.Prerequisites;
 using BuildTool.Publishing;
-using Spectre.Console;
 
 Console.OutputEncoding = Encoding.UTF8;
 
@@ -37,22 +36,6 @@ options.Os ??= detectedPlatform.OsRid;
 options.Arch ??= detectedPlatform.ArchRid;
 var rid = $"{options.Os}-{options.Arch}";
 
-if (options.CheckPrereqsOnly)
-{
-    // Same renderer the guided menu uses, so the two cannot drift. Spectre drops ANSI styling by
-    // itself when stdout is not a terminal, which is the case this flag exists for, but it also
-    // falls back to an 80 column width and folds anything longer. The install hints we print are
-    // shell commands — the CentOS one is 95 characters — and a fold puts a newline in the middle of
-    // a command that someone is meant to copy. Widen the profile so they stay on one line.
-    if (Console.IsOutputRedirected)
-    {
-        AnsiConsole.Profile.Width = 200;
-    }
-
-    // Exit code is the machine-readable half: 0 when everything resolves, 1 when anything is missing.
-    return PrerequisiteChecker.CheckNativeLibraries(detectedPlatform, interactive: false) ? 0 : 1;
-}
-
 // Run prerequisite checks unless skipped
 if (!options.SkipPrereqs)
 {
@@ -125,12 +108,6 @@ static BuildOptions ParseArguments(string[] args)
                     hasNamedArgs = true;
                     break;
                 }
-            case "--check-prereqs":
-                {
-                    options.CheckPrereqsOnly = true;
-                    hasNamedArgs = true;
-                    break;
-                }
             case "--interactive":
                 {
                     options.Interactive = true;

Projects/Server.Tests/Fixtures/TestServerInitializer.cs

@@ -1,4 +1,3 @@
-using System;
 using System.IO;
 using System.Reflection;
 using System.Threading;
@@ -79,15 +78,6 @@ internal static class TestServerInitializer
             Core.LoopContext = new EventLoopContext();
             Core.Expansion = Expansion.EJ;
 
-            // Seed the loop clock as Main.cs does before the Configure sweep; otherwise Core.Now is
-            // DateTime.MinValue for the whole test host.
-            Core._now = DateTime.UtcNow;
-
-            // Timer wheel must exist before NetState.Configure(), which schedules a recurring
-            // sweep via Timer.DelayCall (matches production ordering in Main.cs: Timer.Init runs
-            // before AssemblyHandler.Invoke("Configure")).
-            Timer.Init(0);
-
             // Configure networking (initializes RingSocketManager for tests)
             Server.Network.NetState.Configure();
 
@@ -97,6 +87,8 @@ internal static class TestServerInitializer
             // Configure the world
             World.Configure();
 
+            Timer.Init(0);
+
             // Load the world
             World.Load();
 

Projects/Server.Tests/Server.Tests.csproj

@@ -5,16 +5,17 @@
         <RootNamespace>Server.Tests</RootNamespace>
     </PropertyGroup>
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.9.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
         <PackageReference Include="xunit" Version="2.9.3" />
         <PackageReference Include="xunit.SkippableFact" Version="1.5.61" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="4.0.0">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <ProjectReference Include="..\Application\Application.csproj" />
         <DataFiles Include="$(SolutionDir)\Distribution\Data\**" />
         <ProjectReference Include="..\UOContent\UOContent.csproj" />
+        <PackageReference Update="Serilog" Version="4.4.0" />
     </ItemGroup>
     <!-- Copy native ioring.dll for tests -->
     <ItemGroup>

Projects/Server.Tests/Tests/Buffers/RawInterpolatedStringHandlerTests.cs

@@ -4,7 +4,6 @@ using Xunit;
 
 namespace Server.Tests.Buffers;
 
-[Collection("Sequential Server Tests")]
 public class RawInterpolatedStringHandlerTests
 {
     [Fact]

Projects/Server.Tests/Tests/Items/DecayRegistrationTests.cs

@@ -208,272 +208,6 @@ public class DecayRegistrationTests
         item.Delete();
     }
 
-    // Unfreezing an item with a stale LastMoved must grant a fresh decay window,
-    // not delete it on the next tick.
-    [Fact]
-    public void StaleImmovableItemMadeMovable_GetsAFreshDecayWindow()
-    {
-        var start = Core._now;
-
-        try
-        {
-            var item = new Item(0x1234);
-            item.MoveToWorld(new Point3D(107, 100, 0), Map.Felucca);
-
-            item.Movable = false;
-            Assert.False(DecayScheduler.IsRegistered(item), "A frozen item must not be tracked for decay.");
-
-            Core._now = start + TimeSpan.FromDays(30);
-            var flipped = Core._now;
-
-            item.Movable = true;
-
-            Assert.True(DecayScheduler.IsRegistered(item), "An unfrozen item must be tracked for decay.");
-
-            AdvanceDecay(flipped, item.DecayTime - TimeSpan.FromMinutes(2), item);
-            Assert.False(item.Deleted, "An unfrozen item must get a full decay window, not vanish immediately.");
-
-            AdvanceDecay(Core._now, TimeSpan.FromMinutes(4), item);
-            Assert.True(item.Deleted, "An unfrozen item must still decay once the fresh window elapses.");
-        }
-        finally
-        {
-            Core._now = start;
-        }
-    }
-
-    // Same transition through the Visible setter: unhiding a long-hidden item.
-    [Fact]
-    public void StaleHiddenItemMadeVisible_GetsAFreshDecayWindow()
-    {
-        var start = Core._now;
-
-        try
-        {
-            var item = new Item(0x1234);
-            item.MoveToWorld(new Point3D(109, 100, 0), Map.Felucca);
-
-            item.Visible = false;
-            Assert.False(DecayScheduler.IsRegistered(item), "A hidden item must not be tracked for decay.");
-
-            Core._now = start + TimeSpan.FromDays(30);
-            var flipped = Core._now;
-
-            item.Visible = true;
-
-            Assert.True(DecayScheduler.IsRegistered(item), "An unhidden item must be tracked for decay.");
-
-            AdvanceDecay(flipped, item.DecayTime - TimeSpan.FromMinutes(2), item);
-            Assert.False(item.Deleted, "An unhidden item must get a full decay window, not vanish immediately.");
-
-            AdvanceDecay(Core._now, TimeSpan.FromMinutes(4), item);
-            Assert.True(item.Deleted, "An unhidden item must still decay once the fresh window elapses.");
-        }
-        finally
-        {
-            Core._now = start;
-        }
-    }
-
-    // A refusal restarts the countdown without rewriting LastMoved.
-    [Fact]
-    public void RefusedDecay_DoesNotRewriteLastMoved()
-    {
-        var start = Core._now;
-
-        try
-        {
-            var item = new RefusesDecayItem();
-            item.MoveToWorld(new Point3D(110, 100, 0), Map.Felucca);
-            var lastMoved = item.LastMoved;
-
-            AdvanceDecay(start, item.DecayTime + TimeSpan.FromMinutes(2), item);
-
-            Assert.False(item.Deleted, "A refused decay must not delete the item.");
-            Assert.True(DecayScheduler.IsRegistered(item), "A refused decay must leave the item tracked.");
-            Assert.Equal(lastMoved, item.LastMoved);
-
-            item.Delete();
-        }
-        finally
-        {
-            Core._now = start;
-        }
-    }
-
-    // The fresh window must survive a save/load cycle, or a restart mid-window deletes the item.
-    [Fact]
-    public void FreshDecayWindow_SurvivesSerialization()
-    {
-        var start = Core._now;
-
-        try
-        {
-            var item = new Item(0x1234);
-            item.MoveToWorld(new Point3D(111, 100, 0), Map.Felucca);
-
-            item.Movable = false;
-            Core._now = start + TimeSpan.FromDays(30);
-            item.Movable = true;
-
-            var expected = item.ScheduledDecayTime;
-
-            var writer = new BufferWriter(new byte[512], true);
-            item.Serialize(writer);
-
-            var copy = new Item(item.Serial);
-            copy.Deserialize(new BufferReader(writer.Buffer));
-
-            // The stamp is stored as a delta, so it ages only by the real time between
-            // write and read - milliseconds here, the downtime in production.
-            Assert.True(
-                (copy.ScheduledDecayTime - expected).Duration() <= TimeSpan.FromSeconds(5),
-                "The restarted decay window must survive a save/load cycle."
-            );
-
-            item.Delete();
-            copy.Delete();
-        }
-        finally
-        {
-            Core._now = start;
-        }
-    }
-
-    // A real move supersedes the reset stamp; it must be dropped so the CompactInfo can collapse.
-    [Fact]
-    public void MovingAnItem_ClearsASupersededDecayResetStamp()
-    {
-        var start = Core._now;
-
-        try
-        {
-            var item = new Item(0x1234);
-            item.MoveToWorld(new Point3D(112, 100, 0), Map.Felucca);
-
-            item.Movable = false;
-            Core._now = start + TimeSpan.FromDays(30);
-            item.Movable = true;
-
-            Assert.NotEqual(default, item.DecayResetTime);
-
-            Core._now += TimeSpan.FromMinutes(1);
-            item.MoveToWorld(new Point3D(113, 100, 0), Map.Felucca);
-
-            Assert.Equal(default, item.DecayResetTime);
-            Assert.Equal(item.LastMoved + item.DecayTime, item.ScheduledDecayTime);
-            Assert.True(DecayScheduler.IsRegistered(item));
-
-            item.Delete();
-        }
-        finally
-        {
-            Core._now = start;
-        }
-    }
-
-    // Losing decay eligibility makes the stamp meaningless; it must be dropped so the
-    // CompactInfo is not held for as long as the item stays ineligible.
-    [Fact]
-    public void ItemBecomingIneligible_DropsTheDecayResetStamp()
-    {
-        var start = Core._now;
-
-        try
-        {
-            var item = new Item(0x1234);
-            item.MoveToWorld(new Point3D(115, 100, 0), Map.Felucca);
-
-            item.Movable = false;
-            Core._now = start + TimeSpan.FromDays(30);
-            item.Movable = true;
-
-            Assert.NotEqual(default, item.DecayResetTime);
-
-            item.Movable = false;
-
-            Assert.Equal(default, item.DecayResetTime);
-
-            item.Delete();
-        }
-        finally
-        {
-            Core._now = start;
-        }
-    }
-
-    // Moving a stamped item into a container programmatically (no drop, no SetLastMoved)
-    // must also drop the stamp.
-    [Fact]
-    public void StampedItemAddedToContainer_DropsTheDecayResetStamp()
-    {
-        var start = Core._now;
-
-        try
-        {
-            var pack = new Container(0xE75);
-            pack.MoveToWorld(new Point3D(116, 100, 0), Map.Felucca);
-
-            var item = new Item(0x1234);
-            item.MoveToWorld(new Point3D(117, 100, 0), Map.Felucca);
-
-            item.Movable = false;
-            Core._now = start + TimeSpan.FromDays(30);
-            item.Movable = true;
-
-            Assert.NotEqual(default, item.DecayResetTime);
-
-            pack.AddItem(item);
-
-            Assert.Equal(default, item.DecayResetTime);
-
-            pack.Delete();
-        }
-        finally
-        {
-            Core._now = start;
-        }
-    }
-
-    // A raw Map assignment (e.g. a GM changing Map through props) is a move: it must
-    // enroll an untracked item for decay.
-    [Fact]
-    public void ItemMovedToRealMapViaMapSetter_IsRegisteredForDecay()
-    {
-        var item = new Item(0x1234);
-        Assert.False(DecayScheduler.IsRegistered(item));
-
-        item.Map = Map.Felucca;
-
-        Assert.True(item.CanDecay());
-        Assert.True(DecayScheduler.IsRegistered(item), "Item placed on a map via the Map setter must be tracked.");
-
-        item.Delete();
-    }
-
-    // LiftItemDupe places the remainder of a partially lifted ground stack via raw
-    // Location/Map assignments, with no MoveToWorld fallback: it must still be tracked.
-    [Fact]
-    public void PartialLiftOfGroundStack_LeavesRemainderRegisteredForDecay()
-    {
-        var stack = new Item(0x1234) { Stackable = true, Amount = 10 };
-        stack.MoveToWorld(new Point3D(114, 100, 0), Map.Felucca);
-
-        var remainder = Mobile.LiftItemDupe(stack, 3);
-
-        Assert.NotNull(remainder);
-        Assert.Equal(7, remainder.Amount);
-        Assert.Null(remainder.Parent);
-        Assert.Equal(Map.Felucca, remainder.Map);
-        Assert.True(
-            DecayScheduler.IsRegistered(remainder),
-            "The remainder of a partially lifted ground stack must be tracked for decay."
-        );
-
-        stack.Delete();
-        remainder.Delete();
-    }
-
     // Dropping into a container must untrack; taking it back out to the ground must re-track.
     [Fact]
     public void ItemMovedIntoContainerThenBackToGround_IsRegisteredForDecay()

Projects/Server.Tests/Tests/Items/PlayerConstructedStackingTests.cs

@@ -1,95 +0,0 @@
-using Xunit;
-
-namespace Server.Tests;
-
-[Collection("Sequential Server Tests")]
-public class PlayerConstructedStackingTests
-{
-    // PlayerConstructed is per-instance provenance, and stack operations were written when no
-    // item carried any. Merging keeps the receiver's copy of a field and splitting rebuilds one
-    // half from a fixed list of fields, so a flag that is not accounted for in both places is
-    // one that ordinary stacking can launder or erase.
-
-    // Stands in for a real stackable type. LiftItemDupe builds the remainder through the
-    // parameterless constructor and copies only a fixed list of fields onto it -- Stackable is
-    // not on that list -- so the remainder is only stackable if the type restores it the way
-    // every genuine stackable does.
-    private class StackableItem : Item
-    {
-        public StackableItem() => Stackable = true;
-
-        public StackableItem(Serial serial) : base(serial) => Stackable = true;
-    }
-
-    private static StackableItem MakeStack(Serial serial, int amount, bool playerConstructed) =>
-        new(serial) { Amount = amount, PlayerConstructed = playerConstructed };
-
-    [Theory]
-    [InlineData(false)]
-    [InlineData(true)]
-    public void CanStackWith_IsTrueWhenProvenanceMatches(bool playerConstructed)
-    {
-        var first = MakeStack((Serial)0x1, 5, playerConstructed);
-        var second = MakeStack((Serial)0x2, 7, playerConstructed);
-
-        try
-        {
-            Assert.True(first.CanStackWith(second));
-        }
-        finally
-        {
-            first.Delete();
-            second.Delete();
-        }
-    }
-
-    [Theory]
-    [InlineData(false)]
-    [InlineData(true)]
-    public void LiftItemDupe_CopiesPlayerConstructedToRemainder(bool playerConstructed)
-    {
-        var stack = MakeStack((Serial)0x1, 10, playerConstructed);
-        Item remainder = null;
-
-        try
-        {
-            remainder = Mobile.LiftItemDupe(stack, 4);
-
-            Assert.NotNull(remainder);
-            Assert.NotSame(stack, remainder);
-            Assert.Equal(4, stack.Amount);
-            Assert.Equal(6, remainder.Amount);
-            Assert.Equal(playerConstructed, remainder.PlayerConstructed);
-        }
-        finally
-        {
-            stack.Delete();
-            remainder?.Delete();
-        }
-    }
-
-    [Fact]
-    public void SplitHalvesRemainStackableWithEachOther()
-    {
-        // The two halves of a split must still be one pile's worth: if the split dropped the
-        // flag, the remainder would no longer stack back onto what it came from.
-        var stack = MakeStack((Serial)0x1, 10, true);
-        Item remainder = null;
-
-        try
-        {
-            remainder = Mobile.LiftItemDupe(stack, 4);
-            Assert.NotNull(remainder);
-
-            Assert.True(stack.CanStackWith(remainder));
-            Assert.True(stack.StackWith(null, remainder, false));
-            Assert.Equal(10, stack.Amount);
-            Assert.True(stack.PlayerConstructed);
-        }
-        finally
-        {
-            stack.Delete();
-            remainder?.Delete();
-        }
-    }
-}

Projects/Server.Tests/Tests/Network/Bans/BanChannelTests.cs

@@ -1,96 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Threading;
-using Server.Network.Bans;
-using Xunit;
-
-namespace Server.Tests.Network.Bans;
-
-public class BanChannelTests
-{
-    private sealed class FakeReporter : IBanReporter
-    {
-        public readonly List<(IPAddress ip, TimeSpan ttl, string reason)> Reports = [];
-        public readonly List<IPAddress> Retractions = [];
-        public bool ThrowOnReport;
-
-        public string Name => "fake";
-        public bool CanRetract => true;
-        public void Register() { }
-        public void Start(CancellationToken token) { }
-        public void Stop() { }
-
-        public void Report(IPAddress address, TimeSpan ttl, string reason)
-        {
-            if (ThrowOnReport)
-            {
-                throw new InvalidOperationException("boom");
-            }
-
-            Reports.Add((address, ttl, reason));
-        }
-
-        public void Retract(IPAddress address) => Retractions.Add(address);
-    }
-
-    [Fact]
-    public void Report_FansOutToAllReporters()
-    {
-        var a = new FakeReporter();
-        var b = new FakeReporter();
-        BanChannel.ConfigureForTesting([a, b]);
-
-        BanChannel.Report(IPAddress.Parse("1.2.3.4"), TimeSpan.FromHours(1), "rate-limit");
-
-        Assert.Single(a.Reports);
-        Assert.Single(b.Reports);
-        Assert.Equal("rate-limit", a.Reports[0].reason);
-    }
-
-    [Fact]
-    public void Report_SwallowsReporterException()
-    {
-        var bad = new FakeReporter { ThrowOnReport = true };
-        var good = new FakeReporter();
-        BanChannel.ConfigureForTesting([bad, good]);
-
-        BanChannel.Report(IPAddress.Parse("1.2.3.4"), TimeSpan.FromHours(1), "manual");
-
-        Assert.Single(good.Reports); // the throwing reporter does not block the others
-    }
-
-    [Fact]
-    public void Report_SuppressedForExemptAddress()
-    {
-        var reporter = new FakeReporter();
-        BanChannel.ConfigureForTesting([reporter]);
-
-        var exempt = IPAddress.Parse("203.0.113.7");
-        BanChannel.IsExempt = (ip, _) => ip.Equals(exempt);
-
-        try
-        {
-            BanChannel.Report(exempt, TimeSpan.FromHours(1), "rate-limit");
-            Assert.Empty(reporter.Reports); // escalation suppressed; the local gate already acted
-
-            BanChannel.Report(IPAddress.Parse("203.0.113.8"), TimeSpan.FromHours(1), "rate-limit");
-            Assert.Single(reporter.Reports); // everyone else is still contributed
-        }
-        finally
-        {
-            BanChannel.IsExempt = null;
-        }
-    }
-
-    [Fact]
-    public void Retract_ReachesRetractCapableReporters()
-    {
-        var a = new FakeReporter();
-        BanChannel.ConfigureForTesting([a]);
-
-        BanChannel.Retract(IPAddress.Parse("9.9.9.9"));
-
-        Assert.Single(a.Retractions);
-    }
-}

Projects/Server.Tests/Tests/Network/Bans/BanConfigurationTests.cs

@@ -1,44 +0,0 @@
-using System;
-using System.Text.Json;
-using Server.Json;
-using Server.Network.Bans;
-using Xunit;
-
-namespace Server.Tests;
-
-public class BanConfigurationTests
-{
-    // Locks the JsonConfig casing/converter contract: JsonConfig's options are case-SENSITIVE, so
-    // every settings member must carry an explicit [JsonPropertyName("camelCase")] or it silently
-    // binds nothing. These tests round-trip through the exact options the loader uses.
-
-    [Fact]
-    public void BanSettings_RoundTripsThroughJsonConfig()
-    {
-        var original = new BanSettings
-        {
-            ReportRateLimitTrips = false,
-            AutoBanDuration = TimeSpan.FromHours(2)
-        };
-
-        var json = JsonConfig.Serialize(original);
-
-        Assert.Contains("\"reportRateLimitTrips\"", json);
-        Assert.Contains("\"autoBanDuration\"", json);
-
-        var restored = JsonSerializer.Deserialize<BanSettings>(json, JsonConfig.DefaultOptions);
-
-        Assert.NotNull(restored);
-        Assert.Equal(original.ReportRateLimitTrips, restored.ReportRateLimitTrips);
-        Assert.Equal(original.AutoBanDuration, restored.AutoBanDuration); // TimeSpan survives
-    }
-
-    [Fact]
-    public void BanSettings_Defaults_AreReportRateLimitTripsFourHourAutoBan()
-    {
-        var settings = new BanSettings();
-
-        Assert.True(settings.ReportRateLimitTrips);
-        Assert.Equal(TimeSpan.FromHours(4), settings.AutoBanDuration);
-    }
-}

Projects/Server.Tests/Tests/Network/ConnectionFiltersTests.cs

@@ -1,133 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2026 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: ConnectionFiltersTests.cs                                       *
- *                                                                       *
- * This program is free software: you can redistribute it and/or modify  *
- * it under the terms of the GNU General Public License as published by  *
- * the Free Software Foundation, either version 3 of the License, or     *
- * (at your option) any later version.                                   *
- *                                                                       *
- * You should have received a copy of the GNU General Public License     *
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- *************************************************************************/
-
-using System;
-using System.Net;
-using System.Threading;
-using Server.Network;
-using Xunit;
-
-namespace Server.Tests.Network;
-
-[Collection("Sequential Server Tests")]
-public class ConnectionFiltersTests : IDisposable
-{
-    public ConnectionFiltersTests() => ConnectionFilters.ResetForTesting();
-
-    public void Dispose() => ConnectionFilters.ResetForTesting();
-
-    [Fact]
-    public void No_filters_denies_nothing()
-    {
-        Assert.False(ConnectionFilters.ShouldDeny(IPAddress.Parse("1.2.3.4"), out var deniedBy));
-        Assert.Null(deniedBy);
-    }
-
-    [Fact]
-    public void Register_is_idempotent_by_name()
-    {
-        ConnectionFilters.Register(new FakeFilter("dupe", deny: false));
-        ConnectionFilters.Register(new FakeFilter("dupe", deny: true));
-
-        // The second registration is ignored, so the deny:true instance never gets consulted.
-        Assert.Single(ConnectionFilters.Filters);
-        Assert.False(ConnectionFilters.ShouldDeny(IPAddress.Parse("1.2.3.4"), out _));
-    }
-
-    [Fact]
-    public void First_denying_filter_short_circuits_and_is_named()
-    {
-        var first = new FakeFilter("allow-all", deny: false);
-        var second = new FakeFilter("deny-all", deny: true);
-        var third = new FakeFilter("never-reached", deny: true);
-
-        ConnectionFilters.Register(first);
-        ConnectionFilters.Register(second);
-        ConnectionFilters.Register(third);
-
-        Assert.True(ConnectionFilters.ShouldDeny(IPAddress.Parse("1.2.3.4"), out var deniedBy));
-        Assert.Equal("deny-all", deniedBy);
-        Assert.Equal(1, first.Calls);
-        Assert.Equal(1, second.Calls);
-        Assert.Equal(0, third.Calls); // short-circuited
-    }
-
-    // A filter that throws once throws for every subsequent connection, which would turn one bug into an
-    // exception per accept. It must be dropped, and the connection must fail open rather than be denied
-    // by a filter that never actually answered.
-    [Fact]
-    public void Throwing_filter_is_unregistered_and_fails_open()
-    {
-        var bad = new FakeFilter("bad", deny: true, throws: true);
-        var good = new FakeFilter("good", deny: false);
-
-        ConnectionFilters.Register(bad);
-        ConnectionFilters.Register(good);
-
-        Assert.False(ConnectionFilters.ShouldDeny(IPAddress.Parse("1.2.3.4"), out _));
-        Assert.Single(ConnectionFilters.Filters);
-        Assert.Equal("good", ConnectionFilters.Filters[0].Name);
-
-        // Remaining filters still run on the same pass the faulty one was dropped in.
-        Assert.Equal(1, good.Calls);
-    }
-
-    [Fact]
-    public void Register_configures_immediately()
-    {
-        var filter = new FakeFilter("cfg", deny: false);
-        ConnectionFilters.Register(filter);
-
-        Assert.True(filter.Configured);
-    }
-
-    private sealed class FakeFilter : IConnectionFilter
-    {
-        private readonly bool _deny;
-        private readonly bool _throws;
-
-        public FakeFilter(string name, bool deny, bool throws = false)
-        {
-            Name = name;
-            _deny = deny;
-            _throws = throws;
-        }
-
-        public string Name { get; }
-        public int Calls { get; private set; }
-        public bool Configured { get; private set; }
-
-        public void Register() => Configured = true;
-
-        public void Start(CancellationToken token)
-        {
-        }
-
-        public void Stop()
-        {
-        }
-
-        public bool ShouldDeny(IPAddress address)
-        {
-            Calls++;
-            if (_throws)
-            {
-                throw new InvalidOperationException("simulated filter bug");
-            }
-
-            return _deny;
-        }
-    }
-}

Projects/Server.Tests/Tests/Network/EventLoopIdleTests.cs

@@ -1,69 +0,0 @@
-using Xunit;
-
-namespace Server.Tests;
-
-/// <summary>
-/// The event loop only sleeps when every queue it drains is empty. These drains are deliberately
-/// bounded -- ExecuteTasks stops at its per-frame cap -- so leftover work is normal and must keep
-/// the loop awake. Getting this wrong strands queued work for the length of a sleep.
-/// </summary>
-[Collection("Sequential Server Tests")]
-public class EventLoopIdleTests
-{
-    [Fact]
-    public void FreshContextIsEmpty()
-    {
-        var context = new EventLoopContext();
-
-        Assert.True(context.IsEmpty);
-    }
-
-    [Fact]
-    public void PostedWorkMakesContextNonEmpty()
-    {
-        var context = new EventLoopContext();
-
-        context.Post(() => { });
-
-        Assert.False(context.IsEmpty);
-    }
-
-    [Fact]
-    public void PriorityWorkMakesContextNonEmpty()
-    {
-        var context = new EventLoopContext();
-
-        context.Post(() => { }, EventLoopContext.Priority.High);
-
-        Assert.False(context.IsEmpty);
-    }
-
-    [Fact]
-    public void ContextIsEmptyAgainOnceDrained()
-    {
-        var context = new EventLoopContext();
-        context.Post(() => { });
-
-        context.ExecuteTasks();
-
-        Assert.True(context.IsEmpty);
-    }
-
-    [Fact]
-    public void WorkBeyondThePerFrameCapKeepsContextNonEmpty()
-    {
-        // The cap is what makes IsEmpty necessary: a single ExecuteTasks pass cannot be assumed
-        // to have drained everything, so the loop must not treat "I just ran tasks" as "idle".
-        const int perFrameCap = 128;
-        var context = new EventLoopContext(perFrameCap);
-
-        for (var i = 0; i < perFrameCap + 10; i++)
-        {
-            context.Post(() => { });
-        }
-
-        context.ExecuteTasks();
-
-        Assert.False(context.IsEmpty);
-    }
-}

Projects/Server.Tests/Tests/Network/Firewall/FirewallTests.cs

@@ -0,0 +1,137 @@
+
+using System.Net;
+using System.Threading.Tasks;
+using Server.Network;
+using Xunit;
+
+namespace Server.Tests;
+
+public class FirewallTests
+{
+    [Fact]
+    public void Firewall_BlocksIPAddress_WhenAdded()
+    {
+        var ip = IPAddress.Parse("192.168.1.1");
+        var entry = new SingleIpFirewallEntry("192.168.1.1");
+
+        Assert.False(Firewall.IsBlocked(ip));
+
+        Firewall.Add(entry);
+
+        Assert.True(Firewall.IsBlocked(ip));
+    }
+
+    [Fact]
+    public void Firewall_DoesNotBlockIPAddress_WhenNotAdded()
+    {
+        var ip = IPAddress.Parse("192.168.1.2");
+        Assert.False(Firewall.IsBlocked(ip));
+    }
+
+    [Fact]
+    public void Firewall_StopsBlockingIPAddress_WhenRemoved()
+    {
+        var ip = IPAddress.Parse("192.168.1.3");
+        var entry = new SingleIpFirewallEntry("192.168.1.3");
+
+        Firewall.Add(entry);
+        Assert.True(Firewall.IsBlocked(ip));
+
+        Firewall.Remove(entry);
+        Assert.False(Firewall.IsBlocked(ip));
+    }
+
+    [Fact]
+    public void Firewall_BlocksIPRange()
+    {
+        var entry = new CidrFirewallEntry(IPAddress.Parse("10.0.0.1"), IPAddress.Parse("10.0.0.5"));
+
+        Firewall.Add(entry);
+
+        Assert.True(Firewall.IsBlocked(IPAddress.Parse("10.0.0.1")));
+        Assert.True(Firewall.IsBlocked(IPAddress.Parse("10.0.0.3")));
+        Assert.True(Firewall.IsBlocked(IPAddress.Parse("10.0.0.5")));
+
+        Assert.False(Firewall.IsBlocked(IPAddress.Parse("10.0.0.6")));
+    }
+
+    [Fact]
+    public void Firewall_CacheInvalidation_WorksOnUpdate()
+    {
+        var ip = IPAddress.Parse("192.168.1.10");
+        var entry = new SingleIpFirewallEntry("192.168.1.10");
+
+        Firewall.Add(entry);
+        Assert.True(Firewall.IsBlocked(ip));
+
+        Firewall.Remove(entry);
+        Assert.False(Firewall.IsBlocked(ip));
+    }
+
+    [Fact]
+    public void Firewall_ReadsFirewallSetCorrectly()
+    {
+        var entry = new SingleIpFirewallEntry("172.16.0.1");
+        Firewall.Add(entry);
+
+        var found = false;
+        Firewall.ReadFirewallSet(set =>
+        {
+            found = set.Contains(entry);
+        });
+
+        Assert.True(found);
+    }
+
+    [Fact]
+    public void Firewall_IsThreadSafe()
+    {
+        var testIps = new IPAddress[256];
+        for (var i = 0; i <= 255; i++)
+        {
+            testIps[i] = IPAddress.Parse($"192.168.0.{i}");
+        }
+
+        var entry = new CidrFirewallEntry(IPAddress.Parse("192.168.0.1"), IPAddress.Parse("192.168.0.255"));
+        Firewall.Add(entry);
+
+        Parallel.ForEach(testIps, ip =>
+        {
+            var shouldBlock = int.Parse(ip.ToString().Split('.')[3]) is > 0;
+            Assert.Equal(shouldBlock, Firewall.IsBlocked(ip));
+        });
+
+        Firewall.Remove(entry);
+
+        Parallel.ForEach(testIps, ip =>
+        {
+            Assert.False(Firewall.IsBlocked(ip));
+        });
+    }
+
+    [Fact]
+    public void Firewall_DoesNotThrowWhenRemovingNonExistentEntry()
+    {
+        var entry = new SingleIpFirewallEntry("203.0.113.5");
+        Assert.False(Firewall.Remove(entry));
+    }
+
+    [Fact]
+    public void Firewall_CacheHandlesMultipleUpdates()
+    {
+        var ip = IPAddress.Parse("192.168.1.20");
+        var entry = new SingleIpFirewallEntry("192.168.1.20");
+
+        Firewall.Add(entry);
+        Assert.True(Firewall.IsBlocked(ip));
+
+        Firewall.Remove(entry);
+        Assert.False(Firewall.IsBlocked(ip));
+
+        Firewall.Add(entry);
+        Assert.True(Firewall.IsBlocked(ip));
+
+        Firewall.Remove(entry);
+        Assert.False(Firewall.IsBlocked(ip));
+    }
+}

Projects/Server.Tests/Tests/Network/ForeignProtocolTests.cs

@@ -1,116 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2026 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: ForeignProtocolTests.cs                                         *
- *                                                                       *
- * This program is free software: you can redistribute it and/or modify  *
- * it under the terms of the GNU General Public License as published by  *
- * the Free Software Foundation, either version 3 of the License, or     *
- * (at your option) any later version.                                   *
- *                                                                       *
- * You should have received a copy of the GNU General Public License     *
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- *************************************************************************/
-
-using System.Text;
-using Server.Network;
-using Xunit;
-
-namespace Server.Tests.Network;
-
-public class ForeignProtocolTests
-{
-    private static ForeignProtocolMatch Identify(byte[] bytes, out ForeignProtocolKind kind) =>
-        ForeignProtocol.Identify(bytes, out kind);
-
-    private static byte[] Ascii(string s) => Encoding.ASCII.GetBytes(s);
-
-    [Theory]
-    [InlineData("GET / HTTP/1.1\r\n")]
-    [InlineData("POST /a HTTP/1.1\r\n")]
-    [InlineData("HEAD / HTTP/1.0\r\n")]
-    [InlineData("OPTIONS * HTTP/1.1\r\n")]
-    [InlineData("CONNECT host:443 HTTP/1.1\r\n")]
-    [InlineData("DELETE /x HTTP/1.1\r\n")]
-    public void Http_requests_are_identified(string request)
-    {
-        Assert.Equal(ForeignProtocolMatch.Confirmed, Identify(Ascii(request), out var kind));
-        Assert.Equal(ForeignProtocolKind.Http, kind);
-    }
-
-    [Fact]
-    public void Ssh_banner_is_identified()
-    {
-        Assert.Equal(ForeignProtocolMatch.Confirmed, Identify(Ascii("SSH-2.0-OpenSSH_9.6"), out var kind));
-        Assert.Equal(ForeignProtocolKind.Ssh, kind);
-    }
-
-    [Fact]
-    public void Tls_client_hello_is_identified()
-    {
-        // handshake, TLS 1.2 record, length 0x0100, ClientHello
-        byte[] hello = [0x16, 0x03, 0x03, 0x01, 0x00, 0x01, 0x00, 0x00, 0xFC];
-
-        Assert.Equal(ForeignProtocolMatch.Confirmed, Identify(hello, out var kind));
-        Assert.Equal(ForeignProtocolKind.Tls, kind);
-    }
-
-    [Fact]
-    public void Tls_prefix_without_a_client_hello_is_not_foreign()
-    {
-        // A seed can spell 0x16 0x03 0x0? -- the address 22.3.x.x. Byte five is a packet id, not a
-        // handshake type, so it must fall through to normal parsing.
-        byte[] seedThenLogin = [0x16, 0x03, 0x03, 0x04, 0x00, 0x80, 0x00, 0x00];
-
-        Assert.Equal(ForeignProtocolMatch.None, Identify(seedThenLogin, out var kind));
-        Assert.Equal(ForeignProtocolKind.None, kind);
-    }
-
-    [Fact]
-    public void Seed_that_spells_an_http_method_falls_through()
-    {
-        // Seed 0x47455420 spells "GET ". The next byte is the 0x80 login packet id, not printable, so this
-        // is a real client and must not be flagged.
-        byte[] seedThenLogin = [(byte)'G', (byte)'E', (byte)'T', (byte)' ', 0x80, 0x00, 0x3A, 0x00];
-
-        Assert.Equal(ForeignProtocolMatch.None, Identify(seedThenLogin, out _));
-    }
-
-    [Theory]
-    [InlineData(0x80)] // login request
-    [InlineData(0x91)] // game server login
-    [InlineData(0xEF)] // new-style seed packet
-    public void Ordinary_uo_openings_are_not_foreign(byte secondPacketId)
-    {
-        byte[] buffer = [0x7F, 0x00, 0x00, 0x01, secondPacketId, 0x00, 0x00, 0x00];
-
-        Assert.Equal(ForeignProtocolMatch.None, Identify(buffer, out _));
-    }
-
-    [Fact]
-    public void Encrypted_login_is_not_mistaken_for_a_foreign_protocol()
-    {
-        // A legitimate client with encryption on when the shard expects none. The login cipher is a
-        // byte-for-byte XOR, so this is noise of exactly the right length.
-        byte[] buffer = [0x7F, 0x00, 0x00, 0x01, 0xC3, 0x9A, 0x04, 0xE1, 0x55, 0xB2];
-
-        Assert.Equal(ForeignProtocolMatch.None, Identify(buffer, out _));
-    }
-
-    [Fact]
-    public void Prefix_match_without_enough_bytes_waits()
-    {
-        // Framing is never assumed: "GET " split from its request line must wait.
-        Assert.Equal(ForeignProtocolMatch.Incomplete, Identify(Ascii("GET "), out _));
-        Assert.Equal(ForeignProtocolMatch.Incomplete, Identify(Ascii("GET /"), out _));
-    }
-
-    [Fact]
-    public void Too_few_bytes_to_match_a_prefix_is_not_foreign()
-    {
-        // Under four bytes the caller's own short-read handling applies.
-        Assert.Equal(ForeignProtocolMatch.None, Identify(Ascii("GE"), out _));
-        Assert.Equal(ForeignProtocolMatch.None, Identify([], out _));
-    }
-}

Projects/Server.Tests/Tests/Network/NetworkCompressionBoundsTests.cs

@@ -1,86 +0,0 @@
-using System;
-using Server.Network;
-using Xunit;
-
-namespace Server.Tests.Network;
-
-/// <summary>
-/// Bounds behaviour of the Huffman compressor when the destination is too small.
-///
-/// This is reachable in production: NetState only checks that the send buffer has *some* writable
-/// space before handing the remainder to Compress, so a nearly-full buffer can offer a span of one
-/// to three bytes. The internal guard is computed as an unsigned <c>output.Length - 4</c>, which
-/// underflows for those sizes and stops bounding the writes at all.
-/// </summary>
-public class NetworkCompressionBoundsTests
-{
-    [Theory]
-    [InlineData(0)]
-    [InlineData(1)]
-    [InlineData(2)]
-    [InlineData(3)]
-    public void RefusesOutputTooSmallToBound(int outputSize)
-    {
-        var input = new byte[64];
-        Array.Fill(input, (byte)'A');
-
-        // Sentinel-filled backing array; only the middle window is offered to the compressor, so
-        // any write past the span shows up as a modified sentinel rather than silent corruption.
-        var backing = new byte[256];
-        Array.Fill(backing, (byte)0xCC);
-
-        const int windowStart = 64;
-        var output = backing.AsSpan(windowStart, outputSize);
-
-        var written = NetworkCompression.Compress(input, output);
-
-        Assert.Equal(0, written);
-
-        for (var i = 0; i < backing.Length; i++)
-        {
-            Assert.Equal(0xCC, backing[i]);
-        }
-    }
-
-    [Fact]
-    public void StillCompressesWhenOutputIsLargeEnough()
-    {
-        var input = new byte[64];
-        Array.Fill(input, (byte)'A');
-
-        var output = new byte[256];
-
-        var written = NetworkCompression.Compress(input, output);
-
-        Assert.True(written > 0);
-        Assert.True(written <= output.Length);
-    }
-
-    [Fact]
-    public void ReportsFailureRatherThanOverrunningATightOutput()
-    {
-        // Large input against a small-but-bounded output: the guard is well-defined here, so this
-        // must fail cleanly rather than write past the end.
-        var input = new byte[4096];
-        Array.Fill(input, (byte)'A');
-
-        var backing = new byte[256];
-        Array.Fill(backing, (byte)0xCC);
-
-        const int windowStart = 64;
-        const int windowSize = 16;
-        var output = backing.AsSpan(windowStart, windowSize);
-
-        NetworkCompression.Compress(input, output);
-
-        for (var i = 0; i < windowStart; i++)
-        {
-            Assert.Equal(0xCC, backing[i]);
-        }
-
-        for (var i = windowStart + windowSize; i < backing.Length; i++)
-        {
-            Assert.Equal(0xCC, backing[i]);
-        }
-    }
-}

Projects/Server.Tests/Tests/PropertyList/ObjectPropertyListReentrancyTests.cs

@@ -1,145 +0,0 @@
-using System;
-using Xunit;
-
-namespace Server.Tests;
-
-/// <summary>
-/// The interpolation buffer is rented by the handler ctor and returned by the closing Add, so every
-/// hole is evaluated while it is live. A Reset()/Dispose() landing in that window used to leave the
-/// next Append* spanning a null array: ArgumentNullException, parameter "array".
-/// </summary>
-// Sequential: building a list rents from STArrayPool, which is not thread-safe.
-[Collection("Sequential Server Tests")]
-public class ObjectPropertyListReentrancyTests
-{
-    // Stands in for a property getter that invalidates while its own tooltip is being built.
-    private static string ResettingHole(ObjectPropertyList list, string value)
-    {
-        list.Reset();
-        return value;
-    }
-
-    private static string DisposingHole(ObjectPropertyList list, string value)
-    {
-        list.Dispose();
-        return value;
-    }
-
-    [Fact]
-    public void InterpolatedAdd_ResetMidHole_DoesNotThrow()
-    {
-        var opl = new ObjectPropertyList(null);
-
-        var ex = Record.Exception(
-            () => opl.Add(1060776, $"{ResettingHole(opl, "Knight")}\t{"Council of Mages"}")
-        );
-
-        Assert.Null(ex);
-    }
-
-    [Fact]
-    public void InterpolatedAdd_DisposeMidHole_DoesNotThrow()
-    {
-        var opl = new ObjectPropertyList(null);
-
-        var ex = Record.Exception(
-            () => opl.Add(1060776, $"{DisposingHole(opl, "Knight")}\t{"Council of Mages"}")
-        );
-
-        Assert.Null(ex);
-    }
-}
-
-/// <summary>
-/// The guard is per-list, so nested builds (a GetProperties override that reads another entity's
-/// PropertyList) cannot unguard the outer one the way a single shared slot would.
-/// </summary>
-[Collection("Sequential Server Tests")]
-public class ObjectPropertyListNestedBuildTests
-{
-    [Fact]
-    public void NestedBuild_DoesNotUnguardTheOuterList()
-    {
-        var outer = new ObjectPropertyList(null);
-        var inner = new ObjectPropertyList(null);
-
-        outer.IsBuilding = true;
-        inner.IsBuilding = true;   // another entity starts building, and finishes
-        inner.IsBuilding = false;
-
-        Assert.True(outer.IsBuilding);
-    }
-
-    [Fact]
-    public void Reset_MidInterpolation_LeavesTheListUsable()
-    {
-        var opl = new ObjectPropertyList(null);
-
-        opl.Add(1060776, $"{Reset(opl, "Knight")}\t{"Council of Mages"}");
-        opl.Add(1042971, "still working");
-        opl.Terminate();
-
-        Assert.NotNull(opl.Buffer);
-    }
-
-    private static string Reset(ObjectPropertyList list, string value)
-    {
-        list.Reset();
-        return value;
-    }
-}
-
-
-/// <summary>
-/// Invalidating from inside GetProperties is a defect in the getter, not a case to recover from:
-/// DEBUG throws, RELEASE keeps a possibly stale tooltip without crashing or leaking.
-/// </summary>
-[Collection("Sequential Server Tests")]
-public class PropertyListInvalidationDuringBuildTests
-{
-    private class SelfInvalidatingMobile : Mobile
-    {
-        public int Builds;
-
-        public override void GetProperties(IPropertyList list)
-        {
-            Builds++;
-            base.GetProperties(list);
-            InvalidateProperties();
-            list.Add(1060776, $"{"Knight"}\t{"Council of Mages"}");
-        }
-    }
-
-    private static SelfInvalidatingMobile Place(int x)
-    {
-        var m = new SelfInvalidatingMobile();
-        m.MoveToWorld(new Point3D(x, 1000, 0), Map.Felucca);
-        return m;
-    }
-
-    [Fact]
-    public void InvalidatingFromGetProperties_FailsLoudlyWithoutTearingDownTheBuild()
-    {
-        var wasEnabled = ObjectPropertyList.Enabled;
-        ObjectPropertyList.Enabled = true;
-
-        try
-        {
-            var m = Place(1000);
-
-#if DEBUG
-            Assert.Throws<InvalidOperationException>(() => _ = m.PropertyList);
-#else
-            Assert.Null(Record.Exception(() => _ = m.PropertyList));
-#endif
-
-            // Refused, not retried.
-            Assert.Equal(1, m.Builds);
-            m.Delete();
-        }
-        finally
-        {
-            ObjectPropertyList.Enabled = wasEnabled;
-        }
-    }
-}

Projects/Server.Tests/Tests/PropertyList/ObjectPropertyListSpanAddTests.cs

@@ -62,21 +62,6 @@ public class ObjectPropertyListSpanAddTests
         Assert.Equal((1070722, "Custom"), entries[0]);
     }
 
-    [Fact]
-    public void HashFormat_OnlyMarksIntegers()
-    {
-        // Integer {value:#} emits the cliloc marker "#<value>".
-        var intList = new ObjectPropertyList(null);
-        intList.Add(1062028, $"{1043009:#}");
-        Assert.Equal((1062028, "#1043009"), Decode(intList)[0]);
-
-        // Float {value:#} is the standard '#' custom-numeric (digit-placeholder) format, not a cliloc
-        // marker -- so no leading '#'.
-        var dblList = new ObjectPropertyList(null);
-        dblList.Add(1062028, $"{42.0:#}");
-        Assert.Equal((1062028, 42.0.ToString("#")), Decode(dblList)[0]); // "42"
-    }
-
     [Fact]
     public void Add_TruncatesArgumentOverMaxLength()
     {

Projects/Server.Tests/Tests/Serialization/AnchoredItemSerializationTests.cs

@@ -1,76 +0,0 @@
-using System;
-using Xunit;
-
-namespace Server.Tests;
-
-[Collection("Sequential Server Tests")]
-public class AnchoredItemSerializationTests
-{
-    private static byte[] SerializeItem(Item item)
-    {
-        var writer = new BufferWriter(new byte[256], true);
-        item.Serialize(writer);
-        return writer.Buffer[..(int)writer.Position];
-    }
-
-    /// <summary>
-    /// Item v11 stores LastMoved and DecayResetTime as anchored time: the serialized bytes
-    /// are a function of item state only, not of when the save runs. Pre-v11 stored
-    /// minutes-since-moved and delta time, which rewrote the bytes on every save.
-    /// </summary>
-    [Fact]
-    public void ItemBytes_AreStable_AcrossSavesAtDifferentTimes()
-    {
-        var start = Core._now;
-
-        try
-        {
-            var item = new Item(0x1F13);
-            item.MoveToWorld(new Point3D(120, 100, 0), Map.Felucca);
-            item.RestartDecay();
-
-            var first = SerializeItem(item);
-
-            // A save hours later, with no state change, must produce identical bytes.
-            Core._now = start + TimeSpan.FromHours(5);
-            var second = SerializeItem(item);
-
-            Assert.Equal(first, second);
-
-            item.Delete();
-        }
-        finally
-        {
-            Core._now = start;
-        }
-    }
-
-    /// <summary>
-    /// Pre-v11 LastMoved was stored at whole-minute precision relative to the save time and
-    /// could never round-trip exactly. Anchored storage is absolute and exact.
-    /// </summary>
-    [Fact]
-    public void LastMovedAndDecayReset_RoundTripExactly()
-    {
-        var item = new Item(0x1F13);
-        item.MoveToWorld(new Point3D(121, 100, 0), Map.Felucca);
-
-        // Sub-minute precision that the old minutes encoding would have destroyed.
-        var moved = Core.Now - TimeSpan.FromSeconds(90.5) - TimeSpan.FromMilliseconds(123);
-        item.LastMoved = moved;
-
-        item.RestartDecay();
-        var decayReset = item.DecayResetTime;
-        Assert.NotEqual(default(DateTime), decayReset);
-
-        var bytes = SerializeItem(item);
-
-        var restored = new Item((Serial)0x7ffff123u);
-        restored.Deserialize(new BufferReader(bytes));
-
-        Assert.Equal(moved, restored.LastMoved);
-        Assert.Equal(decayReset, restored.DecayResetTime);
-
-        item.Delete();
-    }
-}

Projects/Server.Tests/Tests/Serialization/AnchoredTimeTests.cs

@@ -1,189 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Xunit;
-
-namespace Server.Tests;
-
-public class AnchoredTimeTests
-{
-    private static (BufferWriter Writer, Func<TimeSpan, IGenericReader> Read) CreateRoundTrip()
-    {
-        var writer = new BufferWriter(new byte[64], true);
-        return (writer, shift => new BufferReader(writer.Buffer) { AnchoredTimeShift = shift });
-    }
-
-    [Fact]
-    public void AnchoredTime_RoundTripsExactly_WithZeroShift()
-    {
-        var (writer, read) = CreateRoundTrip();
-        var value = new DateTime(2026, 8, 22, 12, 30, 0, DateTimeKind.Utc);
-
-        writer.WriteAnchoredTime(value);
-
-        Assert.Equal(value, read(TimeSpan.Zero).ReadAnchoredTime());
-    }
-
-    [Fact]
-    public void AnchoredTime_AppliesShiftOnRead()
-    {
-        var (writer, read) = CreateRoundTrip();
-        var value = new DateTime(2026, 8, 22, 12, 30, 0, DateTimeKind.Utc);
-        var shift = TimeSpan.FromHours(3);
-
-        writer.WriteAnchoredTime(value);
-
-        Assert.Equal(value + shift, read(shift).ReadAnchoredTime());
-    }
-
-    [Fact]
-    public void AnchoredTime_SentinelsPassThroughUnshifted()
-    {
-        var (writer, read) = CreateRoundTrip();
-
-        writer.WriteAnchoredTime(DateTime.MinValue);
-        writer.WriteAnchoredTime(DateTime.MaxValue);
-
-        var reader = read(TimeSpan.FromDays(2));
-        Assert.Equal(DateTime.MinValue, reader.ReadAnchoredTime());
-        Assert.Equal(DateTime.MaxValue, reader.ReadAnchoredTime());
-    }
-
-    [Fact]
-    public void AnchoredTime_SaturatesInsteadOfOverflowing()
-    {
-        var (writer, read) = CreateRoundTrip();
-
-        writer.WriteAnchoredTime(DateTime.MaxValue - TimeSpan.FromMinutes(1));
-
-        Assert.Equal(DateTime.MaxValue, read(TimeSpan.FromDays(1)).ReadAnchoredTime());
-    }
-
-    [Fact]
-    public void AnchoredTime_NormalizesLocalKindOnWrite()
-    {
-        var (writer, read) = CreateRoundTrip();
-        var local = new DateTime(2026, 8, 22, 12, 30, 0, DateTimeKind.Local);
-
-        writer.WriteAnchoredTime(local);
-
-        Assert.Equal(local.ToUniversalTime(), read(TimeSpan.Zero).ReadAnchoredTime());
-    }
-}
-
-internal class AnchoredEntity : ISerializable
-{
-    public AnchoredEntity(Serial serial) => Serial = serial;
-
-    public Serial Serial { get; }
-    public DateTime Created { get; set; } = DateTime.UtcNow;
-    public bool Deleted => false;
-
-    public DateTime LastRested { get; set; }
-
-    public void Delete()
-    {
-    }
-
-    public void Serialize(IGenericWriter writer) => writer.WriteAnchoredTime(LastRested);
-
-    public void Deserialize(IGenericReader reader) => LastRested = reader.ReadAnchoredTime();
-}
-
-[Collection("Sequential Server Tests")]
-public class AnchoredTimePersistenceTests
-{
-    private class AnchoredPersistence : GenericEntityPersistence<AnchoredEntity>
-    {
-        public AnchoredPersistence(int priority) : base("AnchoredTrip", priority, 1, 0x7FFFFFFF)
-        {
-        }
-    }
-
-    /// <summary>
-    /// The idx v5 header carries the save-start anchor; loading re-bases anchored timestamps
-    /// by the elapsed time since the save started, so downtime does not age them.
-    /// </summary>
-    [Fact]
-    public void SaveStartAnchor_RebasesAnchoredTimestampsAtLoad()
-    {
-        var previousAssemblies = AssemblyHandler.Assemblies;
-        AssemblyHandler.Assemblies = [.. previousAssemblies ?? [], typeof(AnchoredEntity).Assembly];
-
-        var source = new SerializationChunkSource();
-        var workers = new SerializationThreadWorker[2];
-        for (var i = 0; i < workers.Length; i++)
-        {
-            workers[i] = new SerializationThreadWorker(i, source);
-            workers[i].AllocateHeap();
-        }
-
-        var previousWorkers = World._threadWorkers;
-        World._threadWorkers = workers;
-
-        var previousSaveStart = World.SaveStartTime;
-
-        var persistence = new AnchoredPersistence(2100);
-        AnchoredPersistence loaded = null;
-
-        var dir = Path.Combine(Path.GetTempPath(), $"muo-anchored-{Guid.NewGuid():N}");
-        Directory.CreateDirectory(dir);
-
-        try
-        {
-            var lastRested = Core.Now - TimeSpan.FromMinutes(10);
-            var serial = (Serial)1u;
-            persistence.EntitiesBySerial[serial] = new AnchoredEntity(serial) { LastRested = lastRested };
-            persistence.RegisterType(typeof(AnchoredEntity));
-
-            // Pretend the save started two hours ago, as if the server had been down since.
-            var downtime = TimeSpan.FromHours(2);
-            World.SaveStartTime = Core.Now - downtime;
-
-            foreach (var worker in workers)
-            {
-                worker.Wake();
-            }
-
-            source.SetOwner(persistence);
-            Assert.True(persistence.TrySnapshotEntries(out var slotCount));
-            source.PushSlotRanges(persistence, slotCount);
-
-            source.Flush();
-            foreach (var worker in workers)
-            {
-                worker.Sleep();
-            }
-
-            persistence.WriteSnapshot(dir);
-            persistence.PostWorldSave();
-
-            loaded = new AnchoredPersistence(2101);
-            loaded.DeserializeIndexes(dir, null);
-            loaded.Deserialize(dir, null);
-
-            var entity = loaded.EntitiesBySerial[serial];
-            var expected = lastRested + downtime;
-
-            Assert.True(
-                (entity.LastRested - expected).Duration() <= TimeSpan.FromSeconds(30),
-                $"Anchored timestamp must re-base by the downtime; expected ~{expected}, got {entity.LastRested}."
-            );
-        }
-        finally
-        {
-            World.SaveStartTime = previousSaveStart;
-            persistence.Unregister();
-            loaded?.Unregister();
-
-            foreach (var worker in workers)
-            {
-                worker.Exit();
-            }
-
-            World._threadWorkers = previousWorkers;
-            AssemblyHandler.Assemblies = previousAssemblies;
-            Directory.Delete(dir, true);
-        }
-    }
-}

Projects/Server/Collections/SortedRangeIndex.cs

@@ -1,134 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2026 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: SortedRangeIndex.cs                                             *
- *                                                                       *
- * This program is free software: you can redistribute it and/or modify  *
- * it under the terms of the GNU General Public License as published by  *
- * the Free Software Foundation, either version 3 of the License, or     *
- * (at your option) any later version.                                   *
- *                                                                       *
- * You should have received a copy of the GNU General Public License     *
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- *************************************************************************/
-
-using System;
-using System.Numerics;
-
-namespace Server.Collections;
-
-/// <summary>
-/// Immutable, allocation-lean membership index over a set of inclusive integer ranges. Ranges are
-/// stored as two parallel arrays (<c>_mins</c>/<c>_maxs</c>) sorted by minimum and coalesced into
-/// disjoint runs, so a single binary search decides membership. Coalescing is required for
-/// correctness: <see cref="Contains"/> only inspects the rightmost run whose minimum is &lt;= the
-/// value, which is only sound when the runs never overlap or nest.
-/// </summary>
-public sealed class SortedRangeIndex<T> where T : IBinaryInteger<T>
-{
-    public static readonly SortedRangeIndex<T> Empty = new([], []);
-
-    /// <summary>An inclusive <c>[Min, Max]</c> range. Singles are represented as <c>Min == Max</c>.</summary>
-    public readonly record struct Range(T Min, T Max);
-
-    /// <summary>Orders ranges ascending by minimum; the coalescing pass in <see cref="Build"/> requires this.</summary>
-    public static readonly Comparison<Range> ByMin = static (a, b) => a.Min.CompareTo(b.Min);
-
-    private readonly T[] _mins;
-    private readonly T[] _maxs;
-
-    private SortedRangeIndex(T[] mins, T[] maxs)
-    {
-        _mins = mins;
-        _maxs = maxs;
-    }
-
-    public int Count => _mins.Length;
-
-    /// <summary>
-    /// True when <paramref name="value"/> falls in any range. Binary-searches for the rightmost run
-    /// whose minimum is &lt;= the value, then tests that value against that run's maximum.
-    /// </summary>
-    public bool Contains(T value)
-    {
-        var lo = 0;
-        var hi = _mins.Length - 1;
-        var found = -1;
-        while (lo <= hi)
-        {
-            var mid = (lo + hi) >> 1;
-            if (_mins[mid] <= value)
-            {
-                found = mid;
-                lo = mid + 1;
-            }
-            else
-            {
-                hi = mid - 1;
-            }
-        }
-
-        return found >= 0 && value <= _maxs[found];
-    }
-
-    /// <summary>
-    /// Builds an index from ranges that are already sorted ascending by <see cref="Range.Min"/> (sort
-    /// the source with <see cref="ByMin"/> first). Overlapping and nested ranges are merged into disjoint
-    /// runs. Two passes over the (pooled) input keep the run count exact so only the two final arrays are
-    /// heap-allocated: pass one counts the runs, pass two fills the exact-size arrays.
-    /// </summary>
-    public static SortedRangeIndex<T> Build(ReadOnlySpan<Range> sortedByMin)
-    {
-        if (sortedByMin.IsEmpty)
-        {
-            return Empty;
-        }
-
-        // Pass 1: count the disjoint runs so the final arrays can be sized exactly.
-        var runs = 1;
-        var curMax = sortedByMin[0].Max;
-        for (var i = 1; i < sortedByMin.Length; i++)
-        {
-            var r = sortedByMin[i];
-            if (r.Min <= curMax)
-            {
-                if (r.Max > curMax)
-                {
-                    curMax = r.Max;
-                }
-            }
-            else
-            {
-                runs++;
-                curMax = r.Max;
-            }
-        }
-
-        // Pass 2: write the coalesced runs into the exact-size final arrays.
-        var mins = new T[runs];
-        var maxs = new T[runs];
-        var w = 0;
-        mins[0] = sortedByMin[0].Min;
-        maxs[0] = sortedByMin[0].Max;
-        for (var i = 1; i < sortedByMin.Length; i++)
-        {
-            var r = sortedByMin[i];
-            if (r.Min <= maxs[w])
-            {
-                if (r.Max > maxs[w])
-                {
-                    maxs[w] = r.Max;
-                }
-            }
-            else
-            {
-                w++;
-                mins[w] = r.Min;
-                maxs[w] = r.Max;
-            }
-        }
-
-        return new SortedRangeIndex<T>(mins, maxs);
-    }
-}

Projects/Server/Diagnostics/EventLoopProfiler.cs

@@ -1,234 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2026 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: EventLoopProfiler.cs                                            *
- *                                                                       *
- * This program is free software: you can redistribute it and/or modify  *
- * it under the terms of the GNU General Public License as published by  *
- * the Free Software Foundation, either version 3 of the License, or     *
- * (at your option) any later version.                                   *
- *                                                                       *
- * You should have received a copy of the GNU General Public License     *
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- *************************************************************************/
-
-using System;
-using System.Diagnostics;
-using System.Runtime.CompilerServices;
-
-namespace Server;
-
-public enum LoopPhase
-{
-    MobileDeltas,
-    ItemDeltas,
-    TimerSlice,
-    NetworkSlice,
-    LoopTasks,
-    WorldSnapshot,
-}
-
-/// <summary>
-/// Event-loop time accounting, compiled out of normal builds. Build with
-/// <c>-p:EventLoopProfiling=true</c> to enable; every hook is
-/// <c>[Conditional("EVENT_LOOP_PROFILING")]</c>, so without the flag the call sites do not exist
-/// in the IL and this class is dormant. See dev-docs/debugging-event-loop.md for how to read it.
-/// </summary>
-/// <remarks>
-/// Each one-second sample decomposes wall time into work (per <see cref="LoopPhase"/>), sleep,
-/// GC pause, and a stolen residual (wall - work - sleep): time the host ran something else.
-/// Samples land in a ring buffer (~15 minutes) so a lag episode can be compared against the good
-/// minutes on the same box, build, and world — the baseline RunUO's profiler never had.
-/// </remarks>
-public static class EventLoopProfiler
-{
-    public const int PhaseCount = 6;
-    private const int RingSize = 900;
-    private const long SampleIntervalMs = 1000;
-
-    public struct Sample
-    {
-        public long WallStart;               // Core.TickCount at sample start
-        public long WallMs;                  // sample length
-        public long Iterations;
-        public long Sleeps;
-        public double SleepMs;               // total time blocked in WaitForCompletion
-        public double SleepOvershootMaxMs;   // worst (elapsed - requested) this sample
-        public long LateWakes;               // overshoot >= Timer.TickRate
-        public long WheelLagMaxMs;           // worst wheel lateness observed at Slice entry
-        public long WakesIssued;
-        public long WakesElided;
-        public double GcPauseMs;             // GC.GetTotalPauseDuration delta
-        public int Gen0;
-        public int Gen1;
-        public int Gen2;
-        public PhaseTimes Phases;
-
-        // Work the phases did not account for and the loop did not spend sleeping: host
-        // scheduling steals, and anything between the bracketed phases. GC pauses inside a
-        // phase or sleep inflate those measurements instead, so GcPauseMs overlaps rather
-        // than subtracts.
-        public double StolenMs
-        {
-            get
-            {
-                var known = SleepMs + Phases.Total;
-                return WallMs > known ? WallMs - known : 0;
-            }
-        }
-    }
-
-    [InlineArray(PhaseCount)]
-    public struct PhaseTimes
-    {
-        private double _element0;
-
-        public double Total
-        {
-            get
-            {
-                double total = 0;
-                for (var i = 0; i < PhaseCount; i++)
-                {
-                    total += this[i];
-                }
-
-                return total;
-            }
-        }
-    }
-
-    private static readonly double _msPerTick = 1000.0 / Stopwatch.Frequency;
-
-    private static Sample[] _ring;
-    private static int _ringCount;
-    private static int _ringHead;
-
-    private static Sample _current;
-    private static long _phaseStartTimestamp;
-    private static long _sampleStartedAt;
-    private static TimeSpan _lastGcPause;
-    private static int _lastGen0;
-    private static int _lastGen1;
-    private static int _lastGen2;
-
-    /// <summary>Number of samples recorded so far (capped at the ring size).</summary>
-    public static int SampleCount => _ringCount;
-
-    /// <summary>The sample currently being accumulated (not yet in the ring).</summary>
-    public static Sample Current => _current;
-
-    /// <summary>
-    /// Copies the newest <paramref name="count"/> completed samples, oldest first.
-    /// </summary>
-    public static Sample[] History(int count = RingSize)
-    {
-        count = Math.Min(count, _ringCount);
-        var result = new Sample[count];
-        for (var i = 0; i < count; i++)
-        {
-            result[i] = _ring[(_ringHead - count + i + RingSize) % RingSize];
-        }
-
-        return result;
-    }
-
-    [Conditional("EVENT_LOOP_PROFILING")]
-    public static void IterationStart(long tickCount)
-    {
-        if (_ring == null)
-        {
-            _ring = new Sample[RingSize];
-            _sampleStartedAt = tickCount;
-            _current.WallStart = tickCount;
-            _lastGcPause = GC.GetTotalPauseDuration();
-            _lastGen0 = GC.CollectionCount(0);
-            _lastGen1 = GC.CollectionCount(1);
-            _lastGen2 = GC.CollectionCount(2);
-        }
-
-        _current.Iterations++;
-
-        if (tickCount - _sampleStartedAt < SampleIntervalMs)
-        {
-            return;
-        }
-
-        _current.WallMs = tickCount - _sampleStartedAt;
-
-        var pause = GC.GetTotalPauseDuration();
-        _current.GcPauseMs = (pause - _lastGcPause).TotalMilliseconds;
-        _lastGcPause = pause;
-
-        var gen0 = GC.CollectionCount(0);
-        var gen1 = GC.CollectionCount(1);
-        var gen2 = GC.CollectionCount(2);
-        _current.Gen0 = gen0 - _lastGen0;
-        _current.Gen1 = gen1 - _lastGen1;
-        _current.Gen2 = gen2 - _lastGen2;
-        _lastGen0 = gen0;
-        _lastGen1 = gen1;
-        _lastGen2 = gen2;
-
-        _ring[_ringHead] = _current;
-        _ringHead = (_ringHead + 1) % RingSize;
-        if (_ringCount < RingSize)
-        {
-            _ringCount++;
-        }
-
-        _sampleStartedAt = tickCount;
-        _current = default;
-        _current.WallStart = tickCount;
-    }
-
-    [Conditional("EVENT_LOOP_PROFILING")]
-    public static void PhaseStart(LoopPhase phase) => _phaseStartTimestamp = Stopwatch.GetTimestamp();
-
-    [Conditional("EVENT_LOOP_PROFILING")]
-    public static void PhaseEnd(LoopPhase phase) =>
-        _current.Phases[(int)phase] += (Stopwatch.GetTimestamp() - _phaseStartTimestamp) * _msPerTick;
-
-    [Conditional("EVENT_LOOP_PROFILING")]
-    public static void SleepEnd(int requestedMs, long elapsedMs)
-    {
-        _current.Sleeps++;
-        _current.SleepMs += elapsedMs;
-
-        var overshoot = elapsedMs - requestedMs;
-        if (overshoot > _current.SleepOvershootMaxMs)
-        {
-            _current.SleepOvershootMaxMs = overshoot;
-        }
-
-        if (overshoot >= Timer.TickRate)
-        {
-            _current.LateWakes++;
-        }
-    }
-
-    [Conditional("EVENT_LOOP_PROFILING")]
-    public static void WheelSlice(long deltaSinceTurn)
-    {
-        var lag = deltaSinceTurn - Timer.TickRate;
-        if (lag > _current.WheelLagMaxMs)
-        {
-            _current.WheelLagMaxMs = lag;
-        }
-    }
-
-    // Cross-thread; approximate counts are fine for diagnosis, so no interlocked.
-    [Conditional("EVENT_LOOP_PROFILING")]
-    public static void WakeSignal(bool elided)
-    {
-        if (elided)
-        {
-            _current.WakesElided++;
-        }
-        else
-        {
-            _current.WakesIssued++;
-        }
-    }
-}

Projects/Server/EventLoopTasks.cs

@@ -42,47 +42,10 @@ public sealed class EventLoopContext : SynchronizationContext
 
     public override SynchronizationContext CreateCopy() => new EventLoopContext();
 
-    /// <summary>
+    public void Post(Action d, Priority priority = Priority.Normal) =>
-    /// True when no callbacks are waiting to run.
-    /// </summary>
-    /// <remarks>
-    /// <see cref="ExecuteTasks"/> drains at most <c>_maxPerFrame</c> callbacks, so work can
-    /// legitimately be left over. The event loop checks this before sleeping so a backlog keeps
-    /// it running instead.
-    /// </remarks>
-    public bool IsEmpty => _queue.IsEmpty && _priorityQueue.IsEmpty;
-
-    public void Post(Action d, Priority priority = Priority.Normal)
-    {
         (priority == Priority.High ? _priorityQueue : _queue).Enqueue(d);
-        WakeEventLoop();
-    }
 
-    public override void Post(SendOrPostCallback d, object state)
+    public override void Post(SendOrPostCallback d, object state) => _queue.Enqueue(() => d(state));
-    {
-        _queue.Enqueue(() => d(state));
-        WakeEventLoop();
-    }
-
-    /// <summary>
-    /// Nudges the game loop in case it is asleep: the loop blocks on network I/O, which a queue
-    /// push alone does not signal.
-    /// </summary>
-    private void WakeEventLoop()
-    {
-        // A post from the loop thread cannot need a wake -- the loop is executing this very call
-        // -- and the signal is a syscall on every backend.
-        if (Thread.CurrentThread == _mainThread)
-        {
-            EventLoopProfiler.WakeSignal(elided: true);
-            return;
-        }
-
-        EventLoopProfiler.WakeSignal(elided: false);
-
-        // Safe before networking is configured and after teardown; NetState.Wake does nothing.
-        Network.NetState.Wake();
-    }
 
     public override void Send(SendOrPostCallback d, object state)
     {
@@ -100,8 +63,6 @@ public sealed class EventLoopContext : SynchronizationContext
             evt.Set();
         });
 
-        WakeEventLoop();
-
         evt.WaitOne();
     }
 

Projects/Server/Events/AccountLoginEvent.cs

@@ -37,13 +37,6 @@ public class AccountLoginEventArgs
     public bool Accepted { get; set; }
 
     public ALRReason RejectReason { get; set; }
-
-    /// <summary>
-    /// No verdict yet: a subscriber moved the password check off the game loop and replies itself
-    /// once it lands. The packet handler must send neither accept nor reject while this is set, or
-    /// the client gets two answers to one login.
-    /// </summary>
-    public bool Deferred { get; set; }
 }
 
 public static partial class EventSink

Projects/Server/FeatureFlags.cs

@@ -10,5 +10,4 @@ public static class ServerFeatureFlags
     public static bool PvPCombat { get; set; } = true;
     public static bool BankAccess { get; set; } = true;
     public static bool SpeedhackDetection { get; set; }
-    public static bool InsuranceEnabled { get; set; }
 }

Projects/Server/Items/Container.cs

@@ -44,10 +44,10 @@ public partial class Container : Item
     internal int _version;
 
     [SerializableField(3)]
-    [SaveFlag(nameof(ShouldSerializeLiftOverride))]
     [SerializedCommandProperty(AccessLevel.GameMaster)]
     private bool _liftOverride;
 
+    [SerializableFieldSaveFlag(3)]
     private bool ShouldSerializeLiftOverride() => _liftOverride;
 
     public Container(int itemID) : base(itemID)
@@ -84,7 +84,6 @@ public partial class Container : Item
 
     [EncodedInt]
     [SerializableProperty(0)]
-    [SaveFlag(nameof(ShouldSerializeMaxItems), nameof(MaxItemsDefaultValue))]
     [CommandProperty(AccessLevel.GameMaster)]
     public int MaxItems
     {
@@ -97,13 +96,14 @@ public partial class Container : Item
         }
     }
 
+    [SerializableFieldSaveFlag(0)]
     private bool ShouldSerializeMaxItems() => _maxItems != -1;
 
+    [SerializableFieldDefault(0)]
     private int MaxItemsDefaultValue() => -1;
 
     [EncodedInt]
     [SerializableProperty(1)]
-    [SaveFlag(nameof(ShouldSerializeGumpId), nameof(GumpIDDefaultValue))]
     [CommandProperty(AccessLevel.GameMaster)]
     public int GumpID
     {
@@ -115,13 +115,14 @@ public partial class Container : Item
         }
     }
 
+    [SerializableFieldSaveFlag(1)]
     private bool ShouldSerializeGumpId() => _gumpID != -1;
 
+    [SerializableFieldDefault(1)]
     private int GumpIDDefaultValue() => -1;
 
     [EncodedInt]
     [SerializableProperty(2)]
-    [SaveFlag(nameof(ShouldSerializeDropSound), nameof(DropSoundDefaultValue))]
     [CommandProperty(AccessLevel.GameMaster)]
     public int DropSound
     {
@@ -133,8 +134,10 @@ public partial class Container : Item
         }
     }
 
+    [SerializableFieldSaveFlag(2)]
     private bool ShouldSerializeDropSound() => _dropSound != -1;
 
+    [SerializableFieldDefault(2)]
     private int DropSoundDefaultValue() => -1;
 
     [CommandProperty(AccessLevel.GameMaster)]

Projects/Server/Items/DecayScheduler.cs

@@ -311,7 +311,7 @@ public class DecayScheduler : Timer
 
             if (timeUntilDecay > _bucketInterval)
             {
-                // Deadline was pushed out (SetLastMoved/RestartDecay) - re-bucket or move to overflow
+                // Item was moved (SetLastMoved called) - re-bucket or move to overflow
                 if (timeUntilDecay > _totalBucketSpan)
                 {
                     // Extended beyond total span - move to overflow
@@ -429,7 +429,7 @@ public class DecayScheduler : Timer
             {
                 // Refused by the region. Restart the clock rather than dropping the item, which has
                 // already left the queue; re-registering as-is would spin on a due time in the past.
-                item.RestartDecay();
+                item.SetLastMoved();
             }
         }
     }

Projects/Server/Items/Item.cs

@@ -14,7 +14,6 @@
  *************************************************************************/
 
 using System;
-using System.Diagnostics;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Runtime.CompilerServices;
@@ -335,25 +334,7 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
     [CommandProperty(AccessLevel.GameMaster)]
     public virtual bool Decays => Movable && Visible && Spawner == null;
 
-    private DateTime _lastMoved;
+    public DateTime LastMoved { get; set; }
-
-    public DateTime LastMoved
-    {
-        get => _lastMoved;
-        set
-        {
-            _lastMoved = value;
-
-            // A move at or past the reset stamp supersedes it; drop it so the CompactInfo can collapse.
-            var info = LookupCompactInfo();
-
-            if (info != null && info.m_DecayReset != default && info.m_DecayReset <= value)
-            {
-                info.m_DecayReset = default;
-                VerifyCompactInfo();
-            }
-        }
-    }
 
     [CommandProperty(AccessLevel.GameMaster)]
     public bool Stackable
@@ -391,7 +372,7 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
                 }
 
                 Delta(ItemDelta.Update);
-                RestartDecay();
+                UpdateDecayRegistration();
             }
         }
     }
@@ -407,7 +388,7 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
                 SetFlag(ImplFlag.Movable, value);
 
                 Delta(ItemDelta.Update);
-                RestartDecay();
+                UpdateDecayRegistration();
             }
         }
     }
@@ -767,12 +748,6 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
 
     public static bool ScissorCopyLootType { get; set; }
 
-    /// <summary>
-    ///     True when the item was produced by the crafting system rather than bought or looted.
-    /// </summary>
-    [CommandProperty(AccessLevel.GameMaster)]
-    public bool PlayerConstructed { get; set; }
-
     [CommandProperty(AccessLevel.GameMaster)]
     public bool QuestItem
     {
@@ -823,22 +798,7 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
 
     public virtual int HuedItemID => m_ItemID;
 
-    public ObjectPropertyList PropertyList
+    public ObjectPropertyList PropertyList => m_PropertyList ??= InitializePropertyList(new ObjectPropertyList(this));
-    {
-        get
-        {
-            if (m_PropertyList == null)
-            {
-                // Publish the list before building it so a nested InvalidateProperties can see the
-                // build in progress and defer instead of recursing into a second throwaway list.
-                var list = new ObjectPropertyList(this);
-                m_PropertyList = list;
-                InitializePropertyList(list);
-            }
-
-            return m_PropertyList;
-        }
-    }
 
     /// <summary>
     ///     Overridable. Fills an <see cref="ObjectPropertyList" /> with everything applicable. By default, this invokes
@@ -863,7 +823,7 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
 
     public virtual void Serialize(IGenericWriter writer)
     {
-        writer.Write(11); // version
+        writer.Write(9); // version
 
         var flags = SaveFlag.None;
 
@@ -973,11 +933,6 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
             {
                 flags |= SaveFlag.SavedFlags;
             }
-
-            if (info.m_DecayReset > LastMoved)
-            {
-                flags |= SaveFlag.DecayReset;
-            }
         }
 
         if (info == null || info.m_Weight < 0)
@@ -1008,21 +963,16 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
             flags |= SaveFlag.ImplFlags;
         }
 
-        if (PlayerConstructed)
-        {
-            flags |= SaveFlag.PlayerConstructed;
-        }
-
         writer.Write((int)flags);
 
-        // Anchored: shifted by downtime at load, so time-since-moved is preserved and the
+        /* begin last moved time optimization */
-        // bytes are stable across saves while the item does not move.
+        var ticks = LastMoved.Ticks;
-        writer.WriteAnchoredTime(LastMoved);
+        var now = Core.Now.Ticks;
 
-        if (GetSaveFlag(flags, SaveFlag.DecayReset))
+        var minutes = new TimeSpan(now - ticks).TotalMinutes;
-        {
+
-            writer.WriteAnchoredTime(info.m_DecayReset);
+        writer.WriteEncodedInt((int)Math.Clamp(minutes, int.MinValue, int.MaxValue));
-        }
+        /* end */
 
         if (GetSaveFlag(flags, SaveFlag.Direction))
         {
@@ -1341,12 +1291,6 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
 
                 OnMapChange();
 
-                if (m_Parent == null)
-                {
-                    // A map change is a move; nothing else updates decay registration for a raw Map change.
-                    SetLastMoved();
-                }
-
                 if (old == null || old == Map.Internal)
                 {
                     InvalidateProperties();
@@ -1577,7 +1521,7 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
 
             if (oldValue != value)
             {
-                RestartDecay();
+                UpdateDecayRegistration();
             }
         }
     }
@@ -1771,7 +1715,6 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
                       || info.m_HeldBy != null
                       || info.m_BlessedFor != null
                       || info.m_Spawner != null
-                      || info.m_DecayReset != default
                       || info.m_TempFlags != 0
                       || info.m_SavedFlags != 0
                       || info.m_Weight >= 0;
@@ -1941,7 +1884,7 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
         {
             list.Add(1049643); // cursed
         }
-        else if (ServerFeatureFlags.InsuranceEnabled && Insured)
+        else if (Insured)
         {
             list.Add(1061682); // <b>insured</b>
         }
@@ -2356,64 +2299,7 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
     public virtual bool OnDecay() =>
         CanDecay() && Region.Find(Location, Map).OnDecay(this);
 
-    public DateTime ScheduledDecayTime
+    public DateTime ScheduledDecayTime => LastMoved + DecayTime;
-    {
-        get
-        {
-            var reset = DecayResetTime;
-            var lastMoved = LastMoved;
-
-            return (reset > lastMoved ? reset : lastMoved) + DecayTime;
-        }
-    }
-
-    /// <summary>
-    /// When decay eligibility was last restored without the item moving, e.g. a GM unfreezing it.
-    /// The decay countdown runs from the later of this and <see cref="LastMoved" />.
-    /// </summary>
-    public DateTime DecayResetTime
-    {
-        get => LookupCompactInfo()?.m_DecayReset ?? default;
-        private set
-        {
-            if (value == default)
-            {
-                var info = LookupCompactInfo();
-
-                if (info != null && info.m_DecayReset != default)
-                {
-                    info.m_DecayReset = default;
-                    VerifyCompactInfo();
-                }
-            }
-            else
-            {
-                AcquireCompactInfo().m_DecayReset = value;
-            }
-        }
-    }
-
-    /// <summary>
-    /// Restarts the decay countdown without touching <see cref="LastMoved" />: call when decay
-    /// eligibility changes state (Movable/Visible/Spawner) or a region refuses a decay, where a
-    /// stale <see cref="LastMoved" /> would otherwise decay the item on the next tick.
-    /// Stamps <see cref="DecayResetTime" /> only when that extends the current deadline, then
-    /// updates the scheduler registration.
-    /// </summary>
-    public void RestartDecay()
-    {
-        if (CanDecay())
-        {
-            var now = Core.Now;
-
-            if (ScheduledDecayTime < now + DecayTime)
-            {
-                DecayResetTime = now;
-            }
-        }
-
-        UpdateDecayRegistration();
-    }
 
     public void UpdateDecayRegistration()
     {
@@ -2423,12 +2309,6 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
         {
             DecayScheduler.Register(this);
         }
-        else
-        {
-            // No countdown to anchor while ineligible; drop the stamp so the CompactInfo
-            // can collapse. Re-eligibility always re-anchors.
-            DecayResetTime = default;
-        }
     }
 
     public void SetLastMoved()
@@ -2461,11 +2341,6 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
         }
 
         Amount += dropped.Amount;
-        if (PlayerConstructed != dropped.PlayerConstructed)
-        {
-            PlayerConstructed = false;
-        }
-
         dropped.Delete();
 
         if (playSound && from != null)
@@ -2554,19 +2429,9 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
 
     private ObjectPropertyList InitializePropertyList(ObjectPropertyList list)
     {
-        list.IsBuilding = true;
+        GetProperties(list);
-
+        AppendChildProperties(list);
-        try
+        list.Terminate();
-        {
-            GetProperties(list);
-            AppendChildProperties(list);
-            list.Terminate();
-        }
-        finally
-        {
-            list.IsBuilding = false;
-        }
-
         return list;
     }
 
@@ -2583,26 +2448,6 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
             return;
         }
 
-        // Always a bug in the property getter, and there is no correct recovery: refuse rather than
-        // hide it. RELEASE keeps a possibly stale tooltip, DEBUG throws.
-        // See dev-docs/property-lists.md "Never Invalidate From Inside GetProperties".
-        if (m_PropertyList?.IsBuilding == true)
-        {
-            logger.Error(
-                "{Entity} called InvalidateProperties() while its property list was being built. Remove the side effect from the property getter, or defer it with Timer.DelayCall.\n{StackTrace}",
-                this,
-                new StackTrace()
-            );
-
-#if DEBUG
-            throw new InvalidOperationException(
-                $"{this} invalidated its property list from inside GetProperties. Remove the side effect from the property getter."
-            );
-#else
-            return;
-#endif
-        }
-
         if (m_Map != null && m_Map != Map.Internal && !World.Loading)
         {
             int? oldHash;
@@ -2766,8 +2611,6 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
 
         switch (version)
         {
-            case 11:
-            case 10:
             case 9:
             case 8:
             case 7:
@@ -2775,11 +2618,7 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
                 {
                     var flags = (SaveFlag)reader.ReadInt();
 
-                    if (version >= 11)
+                    if (version < 7)
-                    {
-                        LastMoved = reader.ReadAnchoredTime();
-                    }
-                    else if (version < 7)
                     {
                         LastMoved = reader.ReadDeltaTime();
                     }
@@ -2797,18 +2636,6 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
                         }
                     }
 
-                    if (version >= 10 && GetSaveFlag(flags, SaveFlag.DecayReset))
-                    {
-                        var reset = version >= 11 ? reader.ReadAnchoredTime() : reader.ReadDeltaTime();
-
-                        // Pre-v11 LastMoved was stored at whole-minute precision; keep the
-                        // stamp only while it still extends the deadline.
-                        if (reset > LastMoved)
-                        {
-                            DecayResetTime = reset;
-                        }
-                    }
-
                     if (GetSaveFlag(flags, SaveFlag.Direction))
                     {
                         m_Direction = (Direction)reader.ReadByte();
@@ -2981,8 +2808,6 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
                         AcquireCompactInfo().m_SavedFlags = reader.ReadEncodedInt();
                     }
 
-                    PlayerConstructed = GetSaveFlag(flags, SaveFlag.PlayerConstructed);
-
                     if (m_Map != null && m_Parent == null)
                     {
                         m_Map.OnEnter(this);
@@ -3454,12 +3279,6 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
         m_DeltaFlags &= ~flags;
     }
 
-    /// <summary>
-    /// True when deltas remain queued after a <see cref="ProcessDeltaQueue"/> pass, which is
-    /// bounded by the count it saw on entry. The event loop consults this before sleeping.
-    /// </summary>
-    public static bool HasQueuedDeltas => m_DeltaQueue.Count > 0;
-
     public static void ProcessDeltaQueue()
     {
         var limit = m_DeltaQueue.Count;
@@ -3566,7 +3385,7 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
         for (var i = 0; i < props.Length; i++)
         {
             var p = props[i];
-            if (p.GetCustomAttribute<IgnoreDupeAttribute>(true) != null || !p.CanRead || !p.CanWrite)
+            if (p.GetCustomAttribute(typeof(IgnoreDupeAttribute), true) != null || !p.CanRead || !p.CanWrite)
             {
                 continue;
             }
@@ -4397,12 +4216,12 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
     }
 
     public virtual bool CheckBlessed(Mobile m) =>
-        m_LootType == LootType.Blessed || ServerFeatureFlags.InsuranceEnabled && Insured || m != null && m == BlessedFor;
+        m_LootType == LootType.Blessed || Mobile.InsuranceEnabled && Insured || m != null && m == BlessedFor;
 
     public virtual bool CheckNewbied() => m_LootType == LootType.Newbied;
 
     public virtual bool IsStandardLoot() =>
-        (!ServerFeatureFlags.InsuranceEnabled || !Insured) && BlessedFor == null && m_LootType == LootType.Regular;
+        (!Mobile.InsuranceEnabled || !Insured) && BlessedFor == null && m_LootType == LootType.Regular;
 
     public override string ToString() => $"{Serial} \"{GetType().Name}\"";
 
@@ -4472,8 +4291,6 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
 
         public ISpawner m_Spawner;
 
-        public DateTime m_DecayReset;
-
         public int m_TempFlags;
 
         public double m_Weight = -1;
@@ -4511,8 +4328,6 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
         HeldBy = 0x00800000,
         IntWeight = 0x01000000,
         SavedFlags = 0x02000000,
-        NullWeight = 0x04000000,
+        NullWeight = 0x04000000
-        PlayerConstructed = 0x08000000,
-        DecayReset = 0x10000000
     }
 }

Projects/Server/Main.cs

@@ -1,4 +1,4 @@
-/*************************************************************************
+/*************************************************************************
  * ModernUO                                                              *
  * Copyright 2019-2026 - ModernUO Development Team                       *
  * Email: hi@modernuo.com                                                *
@@ -30,7 +30,6 @@ using Server.Compression;
 using Server.Json;
 using Server.Logging;
 using Server.Network;
-using Server.Network.Bans;
 using Server.Text;
 
 namespace Server;
@@ -39,181 +38,10 @@ public static class Core
 {
     private static readonly ILogger logger = LogFactory.GetLogger(typeof(Core));
 
-    // Written off-loop (Kill, RequestSnapshot); volatile because the loop blocks between reads.
+    private static bool _performProcessKill;
-    private static volatile bool _performProcessKill;
     private static bool _restartOnKill;
-    private static volatile bool _performSnapshot;
+    private static bool _performSnapshot;
     private static string _snapshotPath;
-
-    // A backstop, not a latency control: the wheel's tick rate already bounds the sleep.
-    // Measured across 1/2/4/8ms; 2 is optimal.
-    private static int _eventLoopIdleWaitMs = 2;
-
-    /// <summary>
-    /// Longest the loop will block while idle, in milliseconds. 0 spins instead; the backoff
-    /// does the same temporarily when the host keeps returning waits late.
-    /// </summary>
-    public static int EventLoopIdleWaitMs => _eventLoopIdleWaitMs;
-
-    /// <summary>
-    /// True when idle sleeping was disabled at startup because the host cannot honor short
-    /// waits, overriding whatever <c>server.eventLoopIdleWaitMs</c> was configured to.
-    /// </summary>
-    public static bool IdleSleepUnsupported { get; private set; }
-
-    /// <summary>
-    /// Whether idle sleeping is currently suspended because the host returned waits late.
-    /// </summary>
-    /// <remarks>
-    /// Compared by subtraction, never directly: tick counts can start enormous and wrap.
-    /// See dev-docs/tick-counts.md.
-    /// </remarks>
-    public static bool IdleSleepSuspended => _tickCount - _idleSleepSuspendedUntil < 0;
-
-    private const long HealthSampleIntervalMs = 1000;
-
-    // Doubling: a fixed suspension oscillates forever on a persistently bad host, while doubling
-    // converges on "stop sleeping" yet still recovers from a transient.
-    private const long BackoffBaseMs = 5000;
-    private const long BackoffMaxMs = 120_000;
-    private const int BackoffMaxShift = 5;
-
-    // Clean streak that clears the escalation.
-    private const long BackoffResetAfterCleanMs = 60_000;
-
-    // Below this a backoff is still recoverable and not actionable, so it only logs at Debug.
-    private const int WarnAfterConsecutiveBackoffs = 3;
-
-    // A sleep is bounded by the next wheel turn, so only a wait returning late can cost a deadline.
-    // Measured per sleep, which is why server work (saves, heavy commands) cannot trip the backoff.
-    private static int _lateWakes;
-
-    // Denominator for the late-wake rate.
-    private static int _sleepAttempts;
-
-    private static long _nextHealthSample;
-    private static long _idleSleepSuspendedUntil;
-    private static int _lateWakeThreshold = 1;
-    private static int _lateWakePercent = 10;
-    private static long _idleSleepBackoffs;
-    private static int _consecutiveBadSamples;
-    private static int _consecutiveBackoffs;
-    private static long _currentBackoffMs = BackoffBaseMs;
-    private static long _lastBackoffAt;
-    private static bool _loggedBackoffCeiling;
-
-    /// <summary>
-    /// Once a second, suspends idle sleeping (with escalating duration) if the host keeps
-    /// returning idle waits a full tick or more late.
-    /// </summary>
-    private static void CheckSchedulerHealth()
-    {
-        if (_tickCount - _nextHealthSample < 0)
-        {
-            return;
-        }
-
-        _nextHealthSample = _tickCount + HealthSampleIntervalMs;
-
-        var late = _lateWakes;
-        var sleeps = _sleepAttempts;
-        _lateWakes = 0;
-        _sleepAttempts = 0;
-
-        // A clean streak resets the escalation and re-arms the ceiling Error. Gated on the count
-        // rather than a "_lastBackoffAt > 0" sentinel because tick counts are not guaranteed positive.
-        if (_consecutiveBackoffs > 0 && _tickCount - _lastBackoffAt > BackoffResetAfterCleanMs)
-        {
-            if (_consecutiveBackoffs >= WarnAfterConsecutiveBackoffs)
-            {
-                logger.Information(
-                    "This host has returned idle waits on time for {Duration}ms; idle sleeping is back to normal",
-                    BackoffResetAfterCleanMs
-                );
-            }
-
-            _consecutiveBackoffs = 0;
-            _loggedBackoffCeiling = false;
-        }
-
-        if (late <= _lateWakeThreshold)
-        {
-            _consecutiveBadSamples = 0;
-            return;
-        }
-
-        // Lateness is a rate: an idle loop sleeps hundreds of times a second, so a few outliers are
-        // normal, while a host that cannot schedule the process returns most of its waits late. The
-        // threshold above is the floor for windows with too few sleeps for a proportion to mean anything.
-        if (late * 100 < sleeps * _lateWakePercent)
-        {
-            _consecutiveBadSamples = 0;
-            return;
-        }
-
-        // Require persistence: any host can drop one sample to unrelated load, but an oversubscribed
-        // one stays bad.
-        if (++_consecutiveBadSamples < 2)
-        {
-            return;
-        }
-
-        if (_eventLoopIdleWaitMs <= 0)
-        {
-            return;
-        }
-
-        _currentBackoffMs = Math.Min(BackoffBaseMs << Math.Min(_consecutiveBackoffs, BackoffMaxShift), BackoffMaxMs);
-        _consecutiveBackoffs++;
-        _lastBackoffAt = _tickCount;
-        _idleSleepSuspendedUntil = _tickCount + _currentBackoffMs;
-        _idleSleepBackoffs++;
-
-        if (_currentBackoffMs >= BackoffMaxMs)
-        {
-            // Escalation has run out of room; say so once.
-            if (!_loggedBackoffCeiling)
-            {
-                _loggedBackoffCeiling = true;
-                logger.Error(
-                    "This host keeps returning idle waits late and sleeping has backed off {Count} times. " +
-                    "The process is not being scheduled promptly, which is typical of shared or burstable vCPUs. " +
-                    "Set server.eventLoopIdleWaitMs to 0 to disable sleeping permanently and trade a full core for latency.",
-                    _idleSleepBackoffs
-                );
-            }
-
-            return;
-        }
-
-        // Each backoff doubles the suspension, so every line is a distinct escalation step and
-        // needs no further rate limiting.
-        if (_consecutiveBackoffs < WarnAfterConsecutiveBackoffs)
-        {
-            logger.Debug(
-                "This host returned a {Requested}ms idle wait at least {TickRate}ms late {Count} of {Sleeps} time(s) " +
-                "in the last second; idle sleeping suspended for {Duration}ms",
-                _eventLoopIdleWaitMs,
-                Timer.TickRate,
-                late,
-                sleeps,
-                _currentBackoffMs
-            );
-
-            return;
-        }
-
-        logger.Warning(
-            "This host returned a {Requested}ms idle wait at least {TickRate}ms late {Count} of {Sleeps} time(s) in " +
-            "the last second, for the {Backoffs}th time running; idle sleeping suspended for {Duration}ms",
-            _eventLoopIdleWaitMs,
-            Timer.TickRate,
-            late,
-            sleeps,
-            _consecutiveBackoffs,
-            _currentBackoffMs
-        );
-    }
     private static bool _crashed;
     private static string _baseDirectory;
 
@@ -282,6 +110,14 @@ public static class Core
 
     public static long Uptime => TickCount - _firstTick;
 
+    private static double _currentCPS;
+    private static double _averageCPS;
+    private static bool _cpsInitialized;
+
+    public static double CyclesPerSecond => _currentCPS;
+
+    public static double AverageCPS => _averageCPS;
+
     public static string BaseDirectory
     {
         get
@@ -398,10 +234,6 @@ public static class Core
     {
         _restartOnKill = restart;
         _performProcessKill = true;
-
-        // Callers are usually off-loop (console input, signal handlers); wake so the request
-        // is noticed now rather than whenever the loop next surfaces.
-        NetState.Wake();
     }
 
     public static void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
@@ -428,7 +260,7 @@ public static class Core
                 // ignored
             }
 
-            if (!close && !Headless)
+            if (!close && !Core.Headless)
             {
                 Console.WriteLine("This exception is fatal, press return to exit");
                 ConsoleInputHandler.ReadLine();
@@ -510,8 +342,6 @@ public static class Core
         World.ExitSerializationThreads();
         PingServer.Shutdown();
         NetState.Shutdown();
-        BanChannel.Stop();
-        ConnectionFilters.Stop();
 
         if (!_crashed)
         {
@@ -591,45 +421,6 @@ public static class Core
 
         ServerConfiguration.Load();
 
-        // 0 disables idle sleeping entirely (full-core spin, zero scheduling overhead).
-        var idleWaitMs = ServerConfiguration.GetSetting("server.eventLoopIdleWaitMs", 2);
-        if (idleWaitMs < 0)
-        {
-            logger.Warning(
-                "server.eventLoopIdleWaitMs {Value} is negative; using 0 (idle sleeping disabled)",
-                idleWaitMs
-            );
-        }
-
-        _eventLoopIdleWaitMs = Math.Max(0, idleWaitMs);
-
-        // Floor for the backoff: idle waits per second the host may return a full tick late before
-        // the rate test below applies at all. Set very high to disable the backoff.
-        var lateWakeThreshold = ServerConfiguration.GetSetting("server.lateWakeThreshold", 1);
-        if (lateWakeThreshold < 0)
-        {
-            logger.Warning(
-                "server.lateWakeThreshold {Value} is negative; using 0",
-                lateWakeThreshold
-            );
-        }
-
-        _lateWakeThreshold = Math.Max(0, lateWakeThreshold);
-
-        // Share of a second's idle waits that must return late before the backoff trips. 0 leaves
-        // the threshold above in sole charge.
-        var lateWakePercent = ServerConfiguration.GetSetting("server.lateWakePercent", 10);
-        if (lateWakePercent is < 0 or > 100)
-        {
-            logger.Warning(
-                "server.lateWakePercent {Value} is outside 0-100; using {Clamped}",
-                lateWakePercent,
-                Math.Clamp(lateWakePercent, 0, 100)
-            );
-        }
-
-        _lateWakePercent = Math.Clamp(lateWakePercent, 0, 100);
-
         var assemblyPath = Path.Join(BaseDirectory, AssembliesConfiguration);
 
         // Load UOContent.dll
@@ -646,8 +437,10 @@ public static class Core
 
         AssemblyHandler.LoadAssemblies(assemblyFiles);
 
-        // First-boot interactive setup. After assemblies load so content can register prompts,
+        // First-boot interactive setup. Runs after assemblies are loaded (so content can
-        // before any Serilog output so prompts are not interleaved with the async console sink.
+        // register prompts) but before any Serilog output, so console prompts are not
+        // interleaved with the async console sink. Handlers self-gate on first-boot state
+        // (e.g. "is my setting already present?").
         AssemblyHandler.Invoke("ConfigurePrompts");
 
         logger.Information("Running on {Framework}", RuntimeInformation.FrameworkDescription);
@@ -657,11 +450,6 @@ public static class Core
         _now = DateTime.UtcNow;
         _firstTick = _tickCount = GetTimestamp();
 
-        // Seed from a real tick: tick counts need not start near zero, so a zero-initialized
-        // deadline compares wrong. See dev-docs/tick-counts.md.
-        _nextHealthSample = _tickCount + HealthSampleIntervalMs;
-        _idleSleepSuspendedUntil = _tickCount;
-
         Timer.Init(_tickCount);
 
         AssemblyHandler.Invoke("Configure");
@@ -673,76 +461,44 @@ public static class Core
 
         AssemblyHandler.Invoke("Initialize");
 
-        BanChannel.Start(ClosingTokenSource.Token);
-        ConnectionFilters.Start(ClosingTokenSource.Token);
         NetState.Start();
         PingServer.Start();
         EventSink.InvokeServerStarted();
-
-        // Without a high-resolution wait a 2ms request quantises to 15.625ms and the loop runs a
-        // tick behind. Only fires when the high-res timer and the timeBeginPeriod fallback both failed.
-        if (_eventLoopIdleWaitMs > 0 && NetState.Ring?.SupportsHighResolutionWait == false)
-        {
-            logger.Error(
-                "This host cannot honor short waits (no high-resolution timer, and raising the system timer " +
-                "resolution failed). Idle sleeping is disabled. The loop will spin instead, using a full core."
-            );
-
-            IdleSleepUnsupported = true;
-            _eventLoopIdleWaitMs = 0;
-        }
-
         RunEventLoop();
     }
 
-    /// <summary>
-    /// True when every queue the loop drains is empty, so sleeping cannot strand pending work.
-    /// The drains are bounded, so leftovers are normal and must keep the loop awake.
-    /// </summary>
-    private static bool IsIdle() =>
-        !Mobile.HasQueuedDeltas && !Item.HasQueuedDeltas && LoopContext.IsEmpty && NetState.IsIdle;
-
     public static void RunEventLoop()
     {
         try
         {
+            var lastRaw = Stopwatch.GetTimestamp();
+            const int interval = 100;
+            double frequency = Stopwatch.Frequency * interval;
+            const double alpha = 2.0 / 129; // EMA smoothing (≈128-sample window)
+
+            var sample = 0;
+
             while (!Closing)
             {
                 _tickCount = GetTimestamp();
                 _now = DateTime.UtcNow;
 
-                EventLoopProfiler.IterationStart(_tickCount);
-
-                EventLoopProfiler.PhaseStart(LoopPhase.MobileDeltas);
                 Mobile.ProcessDeltaQueue();
-                EventLoopProfiler.PhaseEnd(LoopPhase.MobileDeltas);
-
-                EventLoopProfiler.PhaseStart(LoopPhase.ItemDeltas);
                 Item.ProcessDeltaQueue();
-                EventLoopProfiler.PhaseEnd(LoopPhase.ItemDeltas);
-
-                EventLoopProfiler.PhaseStart(LoopPhase.TimerSlice);
                 Timer.Slice(_tickCount);
-                EventLoopProfiler.PhaseEnd(LoopPhase.TimerSlice);
 
                 // Handle networking
-                EventLoopProfiler.PhaseStart(LoopPhase.NetworkSlice);
                 NetState.Slice();
-                EventLoopProfiler.PhaseEnd(LoopPhase.NetworkSlice);
 
                 // Execute captured post-await methods (like Timer.Pause)
-                EventLoopProfiler.PhaseStart(LoopPhase.LoopTasks);
                 LoopContext.ExecuteTasks();
-                EventLoopProfiler.PhaseEnd(LoopPhase.LoopTasks);
 
                 Timer.CheckTimerPool(); // Check for pool depletion so we can async refill it.
 
                 if (_performSnapshot)
                 {
-                    EventLoopProfiler.PhaseStart(LoopPhase.WorldSnapshot);
                     // Return value is the offset that can be used to fix timers that should drift
                     World.Snapshot(_snapshotPath);
-                    EventLoopProfiler.PhaseEnd(LoopPhase.WorldSnapshot);
                     _performSnapshot = false;
                 }
 
@@ -752,35 +508,29 @@ public static class Core
                     break;
                 }
 
-                CheckSchedulerHealth();
+                if (sample++ == interval)
-
-                if (_eventLoopIdleWaitMs > 0 && _tickCount - _idleSleepSuspendedUntil >= 0 && IsIdle())
                 {
-                    // Re-read the clock: a stale timestamp overstates the time to the next tick
+                    sample = 0;
-                    // and sleeps straight past it.
+                    var nowRaw = Stopwatch.GetTimestamp();
-                    var start = GetTimestamp();
+
-                    var due = Timer.MillisecondsUntilNextTick(start);
+                    _currentCPS = frequency / (nowRaw - lastRaw);
-                    if (due > 0)
+
+                    if (!_cpsInitialized)
                     {
-                        var requested = (int)Math.Min(due, _eventLoopIdleWaitMs);
+                        _averageCPS = _currentCPS;
+                        _cpsInitialized = true;
+                    }
+                    else
+                    {
+                        _averageCPS += alpha * (_currentCPS - _averageCPS);
+                    }
 
-                        // The GC prefers to collect during idle sleeps, so its pauses land here by
+                    lastRaw = nowRaw;
-                        // design and are not the host's fault. Gen1 and above (what
-                        // CollectionCount(1) counts) are the only pauses long enough to reach a tick.
-                        var collections = GC.CollectionCount(1);
 
-                        NetState.WaitForCompletion(requested);
+                    var sleepMs = (int)Timer.MillisecondsUntilNextTick(_tickCount);
-
+                    if (sleepMs >= 2)
-                        var elapsed = GetTimestamp() - start;
+                    {
-                        EventLoopProfiler.SleepEnd(requested, elapsed);
+                        NetState.WaitForCompletion(sleepMs - 1);
-                        _sleepAttempts++;
-
-                        // The second collection read sits behind the overshoot test, so the common
-                        // path reads the counter once, not twice.
-                        if (elapsed - requested >= Timer.TickRate && GC.CollectionCount(1) == collections)
-                        {
-                            _lateWakes++;
-                        }
                     }
                 }
             }
@@ -798,9 +548,6 @@ public static class Core
     {
         _snapshotPath = snapshotPath;
         _performSnapshot = true;
-
-        // Save requests arrive off-loop; wake so the snapshot starts now.
-        NetState.Wake();
     }
 
     public static void VerifySerialization()

Projects/Server/Mobiles/Mobile.cs

@@ -26,7 +26,6 @@ using Server.Network;
 using Server.Prompts;
 using Server.Targeting;
 using System;
-using System.Diagnostics;
 using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using Server.Buffers;
@@ -954,6 +953,8 @@ public partial class Mobile : IHued, IComparable<Mobile>, ISpawnable, IObjectPro
 
     public static TimeSpan AutoManifestTimeout { get; set; } = TimeSpan.FromSeconds(5.0);
 
+    public static bool InsuranceEnabled { get; set; }
+
     public static int ActionDelay { get; set; } = 500;
 
     public static VisibleDamageType VisibleDamageType { get; set; }
@@ -2292,22 +2293,7 @@ public partial class Mobile : IHued, IComparable<Mobile>, ISpawnable, IObjectPro
     public int CompareTo(Mobile other) => other == null ? -1 : Serial.CompareTo(other.Serial);
 
     public virtual int HuedItemID => m_Female ? 0x2107 : 0x2106;
-    public ObjectPropertyList PropertyList
+    public ObjectPropertyList PropertyList => m_PropertyList ??= InitializePropertyList(new ObjectPropertyList(this));
-    {
-        get
-        {
-            if (m_PropertyList == null)
-            {
-                // Publish the list before building it so a nested InvalidateProperties can see the
-                // build in progress and defer instead of recursing into a second throwaway list.
-                var list = new ObjectPropertyList(this);
-                m_PropertyList = list;
-                InitializePropertyList(list);
-            }
-
-            return m_PropertyList;
-        }
-    }
 
     public virtual void GetProperties(IPropertyList list)
     {
@@ -2324,11 +2310,11 @@ public partial class Mobile : IHued, IComparable<Mobile>, ISpawnable, IObjectPro
 
     public virtual void Serialize(IGenericWriter writer)
     {
-        writer.Write(38); // version
+        writer.Write(37); // version
 
-        writer.WriteAnchoredTime(LastStrGain);
+        writer.WriteDeltaTime(LastStrGain);
-        writer.WriteAnchoredTime(LastIntGain);
+        writer.WriteDeltaTime(LastIntGain);
-        writer.WriteAnchoredTime(LastDexGain);
+        writer.WriteDeltaTime(LastDexGain);
 
         byte hairflag = 0x00;
 
@@ -5248,15 +5234,8 @@ public partial class Mobile : IHued, IComparable<Mobile>, ISpawnable, IObjectPro
         item.Name = oldItem.Name;
         item.Weight = oldItem.Weight;
 
-        item.PlayerConstructed = oldItem.PlayerConstructed;
         item.Amount = oldAmount - amount;
-
+        item.Map = oldItem.Map;
-        // A parented remainder gets its map from AddItem (parent first, then map), keeping the
-        // split off the decay scheduler; a ground remainder is placed and enrolled here.
-        if (oldItem.Parent == null)
-        {
-            item.Map = oldItem.Map;
-        }
 
         oldItem.OnAfterDuped(item);
 
@@ -6150,7 +6129,6 @@ public partial class Mobile : IHued, IComparable<Mobile>, ISpawnable, IObjectPro
 
         switch (version)
         {
-            case 38: // Stat-gain stamps moved from delta time to anchored time
             case 37: // Decomposed hair into inline item id/hue (dropped the VirtualHairInfo object)
             case 36: // Moved virtues to VirtueSystem
             case 35: // Moved short term murders to PlayerMurderSystem
@@ -6159,18 +6137,9 @@ public partial class Mobile : IHued, IComparable<Mobile>, ISpawnable, IObjectPro
             case 32: // Removed StuckMenu
             case 31:
                 {
-                    if (version >= 38)
+                    LastStrGain = reader.ReadDeltaTime();
-                    {
+                    LastIntGain = reader.ReadDeltaTime();
-                        LastStrGain = reader.ReadAnchoredTime();
+                    LastDexGain = reader.ReadDeltaTime();
-                        LastIntGain = reader.ReadAnchoredTime();
-                        LastDexGain = reader.ReadAnchoredTime();
-                    }
-                    else
-                    {
-                        LastStrGain = reader.ReadDeltaTime();
-                        LastIntGain = reader.ReadDeltaTime();
-                        LastDexGain = reader.ReadDeltaTime();
-                    }
 
                     goto case 30;
                 }
@@ -7258,18 +7227,8 @@ public partial class Mobile : IHued, IComparable<Mobile>, ISpawnable, IObjectPro
 
     private ObjectPropertyList InitializePropertyList(ObjectPropertyList list)
     {
-        list.IsBuilding = true;
+        GetProperties(list);
-
+        list.Terminate();
-        try
-        {
-            GetProperties(list);
-            list.Terminate();
-        }
-        finally
-        {
-            list.IsBuilding = false;
-        }
-
         return list;
     }
 
@@ -7286,26 +7245,6 @@ public partial class Mobile : IHued, IComparable<Mobile>, ISpawnable, IObjectPro
             return;
         }
 
-        // Always a bug in the property getter, and there is no correct recovery: refuse rather than
-        // hide it. RELEASE keeps a possibly stale tooltip, DEBUG throws.
-        // See dev-docs/property-lists.md "Never Invalidate From Inside GetProperties".
-        if (m_PropertyList?.IsBuilding == true)
-        {
-            logger.Error(
-                "{Entity} called InvalidateProperties() while its property list was being built. Remove the side effect from the property getter, or defer it with Timer.DelayCall.\n{StackTrace}",
-                this,
-                new StackTrace()
-            );
-
-#if DEBUG
-            throw new InvalidOperationException(
-                $"{this} invalidated its property list from inside GetProperties. Remove the side effect from the property getter."
-            );
-#else
-            return;
-#endif
-        }
-
         if (m_Map != null && m_Map != Map.Internal && !World.Loading)
         {
             int? oldHash;
@@ -7851,12 +7790,6 @@ public partial class Mobile : IHued, IComparable<Mobile>, ISpawnable, IObjectPro
         }
     }
 
-    /// <summary>
-    /// True when deltas remain queued after a <see cref="ProcessDeltaQueue"/> pass, which is
-    /// bounded by the count it saw on entry. The event loop consults this before sleeping.
-    /// </summary>
-    public static bool HasQueuedDeltas => m_DeltaQueue.Count > 0;
-
     public static void ProcessDeltaQueue()
     {
         var limit = m_DeltaQueue.Count;

Projects/Server/Mobiles/Mods/ResistanceMod.cs

@@ -21,15 +21,17 @@ namespace Server;
 [SerializationGenerator(0)]
 public partial class ResistanceMod : MobileMod
 {
-    [SerializableField(0, fieldChanged: nameof(OnTypeChanged))]
+    [SerializableField(0)]
     private ResistanceType _type;
 
+    [SerializableFieldChanged(0)]
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private void OnTypeChanged(ResistanceType oldValue, ResistanceType newValue) => Owner?.UpdateResistances();
 
-    [SerializableField(1, fieldChanged: nameof(OnOffsetChanged))]
+    [SerializableField(1)]
     private int _offset;
 
+    [SerializableFieldChanged(1)]
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     private void OnOffsetChanged(int oldValue, int newValue) => Owner?.UpdateResistances();
 

Projects/Server/Mobiles/Mods/SkillMod.cs

@@ -21,29 +21,33 @@ namespace Server;
 [SerializationGenerator(0)]
 public abstract partial class SkillMod : MobileMod
 {
-    [SerializableField(0, fieldChanged: nameof(OnObeyCapChanged))]
+    [SerializableField(0)]
     private bool _obeyCap;
 
+    [SerializableFieldChanged(0)]
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private void OnObeyCapChanged(bool oldValue, bool newValue) => Owner?.Skills[_skill]?.Update();
+    private void OnObeCapChanged(bool oldValue, bool newValue) => Owner?.Skills[_skill]?.Update();
 
-    [SerializableField(1, fieldChanged: nameof(OnSkillChanged))]
+    [SerializableField(1)]
     private SkillName _skill;
 
+    [SerializableFieldChanged(1)]
     private void OnSkillChanged(SkillName oldValue, SkillName newValue)
     {
         Owner?.Skills[newValue]?.Update();
         Owner?.Skills[oldValue]?.Update();
     }
 
-    [SerializableField(2, fieldChanged: nameof(OnRelativeChanged))]
+    [SerializableField(2)]
     private bool _relative;
 
+    [SerializableFieldChanged(2)]
     private void OnRelativeChanged(bool oldValue, bool newValue) => Owner?.Skills[_skill]?.Update();
 
-    [SerializableField(3, fieldChanged: nameof(OnValueChanged))]
+    [SerializableField(3)]
     private double _value;
 
+    [SerializableFieldChanged(3)]
     private void OnValueChanged(double oldValue, double newValue) => Owner?.Skills[_skill]?.Update();
 
     public SkillMod(Mobile owner) : base(owner)

Projects/Server/Network/Bans/BanChannel.cs

@@ -1,160 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2026 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: BanChannel.cs                                                   *
- *                                                                       *
- * This program is free software: you can redistribute it and/or modify  *
- * it under the terms of the GNU General Public License as published by  *
- * the Free Software Foundation, either version 3 of the License, or     *
- * (at your option) any later version.                                   *
- *                                                                       *
- * You should have received a copy of the GNU General Public License     *
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- *************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Threading;
-using Server.Logging;
-
-namespace Server.Network.Bans;
-
-/// <summary>
-/// Coordinates the configured <see cref="IBanReporter"/> contribution sinks. Enforcement is NOT here —
-/// the accept path asks <see cref="ConnectionFilters"/>. This channel only fans locally-decided bans out
-/// to external systems (CrowdSec), which distribute them to OS-level bouncers.
-/// </summary>
-public static class BanChannel
-{
-    private static readonly ILogger logger = LogFactory.GetLogger(typeof(BanChannel));
-
-    private static IBanReporter[] _reporters = [];
-
-    public static IReadOnlyList<IBanReporter> Reporters => _reporters;
-
-    /// <summary>
-    /// Registers a contribution sink from content (inversion of control). Idempotent by
-    /// <see cref="IBanReporter.Name"/>: a second registration of the same name is ignored. Configures the
-    /// reporter immediately so it is ready before <see cref="Start"/>.
-    /// </summary>
-    public static void Register(IBanReporter reporter)
-    {
-        if (reporter == null)
-        {
-            return;
-        }
-
-        var reporters = _reporters;
-        for (var i = 0; i < reporters.Length; i++)
-        {
-            if (reporters[i].Name == reporter.Name)
-            {
-                return;
-            }
-        }
-
-        reporter.Register();
-
-        var updated = new IBanReporter[_reporters.Length + 1];
-        Array.Copy(_reporters, updated, _reporters.Length);
-        updated[^1] = reporter;
-        _reporters = updated;
-
-        logger.Information("Ban channel registered reporter '{Name}'", reporter.Name);
-    }
-
-    internal static void ConfigureForTesting(IBanReporter[] reporters) => _reporters = reporters ?? [];
-
-    public static void Start(CancellationToken token)
-    {
-        var reporters = _reporters;
-        for (var i = 0; i < reporters.Length; i++)
-        {
-            var reporter = reporters[i];
-            try
-            {
-                reporter.Start(token);
-            }
-            catch (Exception e)
-            {
-                // A broken contribution path must not crash boot — enforcement is local and unaffected.
-                logger.Error(e, "Ban reporter '{Name}' failed to start; continuing without it", reporter.Name);
-            }
-        }
-    }
-
-    public static void Stop()
-    {
-        var reporters = _reporters;
-        for (var i = 0; i < reporters.Length; i++)
-        {
-            var reporter = reporters[i];
-            try
-            {
-                reporter.Stop();
-            }
-            catch (Exception e)
-            {
-                logger.Warning(e, "Ban reporter '{Name}' threw while stopping", reporter.Name);
-            }
-        }
-    }
-
-    /// <summary>Fans a locally-decided ban out to every reporter. Non-blocking; never throws.</summary>
-    /// <summary>
-    /// Optional content-supplied exemption; true drops the contribution before any reporter sees it. This
-    /// withholds escalation only — the gate that reached the verdict has already acted.
-    /// </summary>
-    /// <remarks>
-    /// An implementation that ignores <c>reason</c> would silently swallow manual bans. See
-    /// <see cref="BanReasons.IsBehavioral"/>.
-    /// </remarks>
-    public static Func<IPAddress, string, bool> IsExempt { get; set; }
-
-    public static void Report(IPAddress ip, TimeSpan ttl, string reason)
-    {
-        var exempt = IsExempt;
-        if (exempt != null && exempt(ip, reason))
-        {
-            logger.Debug("{Address} not contributed ('{Reason}'): exempt", ip, reason);
-            return;
-        }
-
-        var reporters = _reporters;
-        for (var i = 0; i < reporters.Length; i++)
-        {
-            try
-            {
-                reporters[i].Report(ip, ttl, reason);
-            }
-            catch (Exception e)
-            {
-                logger.Warning(e, "Ban reporter '{Name}' threw during Report", reporters[i].Name);
-            }
-        }
-    }
-
-    /// <summary>Fans a retraction (manual unban) out to every retract-capable reporter.</summary>
-    public static void Retract(IPAddress ip)
-    {
-        var reporters = _reporters;
-        for (var i = 0; i < reporters.Length; i++)
-        {
-            if (!reporters[i].CanRetract)
-            {
-                continue;
-            }
-
-            try
-            {
-                reporters[i].Retract(ip);
-            }
-            catch (Exception e)
-            {
-                logger.Warning(e, "Ban reporter '{Name}' threw during Retract", reporters[i].Name);
-            }
-        }
-    }
-}

Projects/Server/Network/Bans/BanConfiguration.cs

@@ -1,98 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2026 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: BanConfiguration.cs                                             *
- *                                                                       *
- * This program is free software: you can redistribute it and/or modify  *
- * it under the terms of the GNU General Public License as published by  *
- * the Free Software Foundation, either version 3 of the License, or     *
- * (at your option) any later version.                                   *
- *                                                                       *
- * You should have received a copy of the GNU General Public License     *
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- *************************************************************************/
-
-using System;
-using System.IO;
-using System.Text.Json.Serialization;
-using Server.Json;
-
-namespace Server.Network.Bans;
-
-/// <summary>
-/// Loads the <see cref="BanSettings"/> from <c>Configuration/bans.json</c> (matching the per-feature
-/// JSON config pattern used by <c>AssistantConfiguration</c>). Loaded once; a missing file writes a
-/// local-only, fail-open template so operators have something to edit.
-/// </summary>
-public static class BanConfiguration
-{
-    private const string _path = "Configuration/bans.json";
-
-    private static bool _loaded;
-
-    /// <summary>
-    /// Never null: the accept and reap paths read this per connection, including before <see cref="Configure"/>
-    /// has run (a harness driving <c>NetState.Slice</c> directly), so it starts at the record's defaults.
-    /// </summary>
-    public static BanSettings Settings { get; private set; } = new();
-
-    public static void Configure()
-    {
-        // Idempotent; flagged rather than null-checked because Settings is non-null from the start.
-        if (_loaded)
-        {
-            return;
-        }
-
-        _loaded = true;
-
-        var path = Path.Join(Core.BaseDirectory, _path);
-
-        if (File.Exists(path))
-        {
-            Settings = JsonConfig.Deserialize<BanSettings>(path);
-        }
-        else
-        {
-            Settings = new BanSettings
-            {
-                ReportRateLimitTrips = true,
-                AutoBanDuration = TimeSpan.FromHours(4)
-            };
-
-            Save();
-        }
-    }
-
-    private static void Save()
-    {
-        JsonConfig.Serialize(Path.Join(Core.BaseDirectory, _path), Settings);
-    }
-}
-
-/// <summary>Ban-channel policy: which reporters receive contributions, and how auto-detections are handled.</summary>
-public record BanSettings
-{
-    /// <summary>Whether IP rate-limiter trips are contributed to reporters. They never enter the local firewall set.</summary>
-    [JsonPropertyName("reportRateLimitTrips")]
-    public bool ReportRateLimitTrips { get; set; } = true;
-
-    /// <summary>Duration reported for an auto-detected (rate-limit) ban.</summary>
-    [JsonPropertyName("autoBanDuration")]
-    public TimeSpan AutoBanDuration { get; set; } = TimeSpan.FromHours(4);
-
-    /// <summary>
-    /// Whether behavioural detections are contributed to reporters. Those connections are disconnected either
-    /// way; this only controls escalation.
-    /// </summary>
-    /// <remarks>
-    /// Keyed on bytes-received, never elapsed time: a connection that sent something and ran out of time is
-    /// far more likely a slow link than an attack. See <c>dev-docs/ip-bans-and-allowlists.md</c>.
-    /// </remarks>
-    [JsonPropertyName("reportBadConnects")]
-    public bool ReportBadConnects { get; set; } = true;
-
-    [JsonPropertyName("badConnectDuration")]
-    public TimeSpan BadConnectDuration { get; set; } = TimeSpan.FromHours(4);
-}

Projects/Server/Network/Bans/BanReasons.cs

@@ -1,48 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2026 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: BanReasons.cs                                                   *
- *                                                                       *
- * This program is free software: you can redistribute it and/or modify  *
- * it under the terms of the GNU General Public License as published by  *
- * the Free Software Foundation, either version 3 of the License, or     *
- * (at your option) any later version.                                   *
- *                                                                       *
- * You should have received a copy of the GNU General Public License     *
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- *************************************************************************/
-
-namespace Server.Network.Bans;
-
-/// <summary>The <c>reason</c> slugs contributed through <see cref="BanChannel"/>. Policy keys off these.</summary>
-public static class BanReasons
-{
-    /// <summary>An operator banned this address explicitly. Never exempt, never auto-denied.</summary>
-    public const string Manual = "manual";
-
-    public const string RateLimit = "rate-limit";
-
-    /// <summary>Matched the reputation blocklist. Enforced by its own filter, not by behaviour.</summary>
-    public const string Blocklist = "blocklist";
-
-    /// <summary>Reaped without ever sending a byte.</summary>
-    public const string SilentConnect = "silent-connect";
-
-    /// <summary>Opened with a zero seed, which no real client sends.</summary>
-    public const string InvalidSeed = "invalid-seed";
-
-    /// <summary>Positively identified as another protocol entirely. See <see cref="ForeignProtocol"/>.</summary>
-    public const string ForeignProtocol = "foreign-protocol";
-
-    /// <summary>
-    /// Verdicts the shard reached by watching the connection. Only these may be exempted, and only these feed
-    /// the local denylist.
-    /// </summary>
-    /// <remarks>
-    /// Opt-in rather than "everything except <see cref="Manual"/>", so a reason added later escalates normally
-    /// instead of silently inheriting an exemption.
-    /// </remarks>
-    public static bool IsBehavioral(string reason) =>
-        reason is RateLimit or SilentConnect or InvalidSeed or ForeignProtocol;
-}

Projects/Server/Network/Bans/IBanReporter.cs

@@ -1,55 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2026 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: IBanReporter.cs                                                 *
- *                                                                       *
- * This program is free software: you can redistribute it and/or modify  *
- * it under the terms of the GNU General Public License as published by  *
- * the Free Software Foundation, either version 3 of the License, or     *
- * (at your option) any later version.                                   *
- *                                                                       *
- * You should have received a copy of the GNU General Public License     *
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- *************************************************************************/
-
-using System;
-using System.Net;
-using System.Threading;
-
-namespace Server.Network.Bans;
-
-/// <summary>
-/// A contribution sink behind <see cref="BanChannel"/>. Reporters receive locally-decided bans
-/// (manual admin bans, rate-limit trips, blocklist promotions) and forward them to an external system
-/// (e.g. CrowdSec), which distributes them to OS-level bouncers. Reporters never answer the accept-path
-/// membership query — that is an <see cref="IConnectionFilter"/>'s job.
-/// </summary>
-public interface IBanReporter
-{
-    /// <summary>Stable id for logging/config (e.g. <c>crowdsec</c>).</summary>
-    string Name { get; }
-
-    /// <summary>Reads configuration. No network or file I/O here.</summary>
-    void Register();
-
-    /// <summary>Starts background delivery. The token is cancelled on shutdown.</summary>
-    void Start(CancellationToken token);
-
-    /// <summary>Flushes and tears down background delivery.</summary>
-    void Stop();
-
-    /// <summary>
-    /// Enqueues a ban contribution. MUST be non-blocking and safe on the accept path: it may only
-    /// enqueue (bounded, drop-on-overflow) and never perform synchronous I/O.
-    /// </summary>
-    /// <param name="ttl"><see cref="TimeSpan.Zero"/> or negative = use the reporter's default duration.</param>
-    /// <param name="reason">Short slug (<c>manual</c>, <c>rate-limit</c>) used as the scenario suffix.</param>
-    void Report(IPAddress address, TimeSpan ttl, string reason);
-
-    /// <summary>True if this reporter can retract a previously-reported ban.</summary>
-    bool CanRetract { get; }
-
-    /// <summary>Enqueues a retraction (e.g. a manual unban). No-op if unsupported.</summary>
-    void Retract(IPAddress address);
-}

Projects/Server/Network/ConnectionFilters.cs

@@ -1,155 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2026 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: ConnectionFilters.cs                                            *
- *                                                                       *
- * This program is free software: you can redistribute it and/or modify  *
- * it under the terms of the GNU General Public License as published by  *
- * the Free Software Foundation, either version 3 of the License, or     *
- * (at your option) any later version.                                   *
- *                                                                       *
- * You should have received a copy of the GNU General Public License     *
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- *************************************************************************/
-
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Threading;
-using Server.Logging;
-
-namespace Server.Network;
-
-/// <summary>
-/// Registry of the <see cref="IConnectionFilter"/> gates the accept path consults, and their lifecycle.
-/// Filters are registered during the Configure sweep and the backing store is a plain array, so
-/// <see cref="ShouldDeny"/> is an indexed loop over a field read — no enumerator, no closure, no
-/// allocation. The whole accept path runs on the game loop, so no synchronization is needed.
-/// </summary>
-public static class ConnectionFilters
-{
-    private static readonly ILogger logger = LogFactory.GetLogger(typeof(ConnectionFilters));
-
-    private static IConnectionFilter[] _filters = [];
-
-    public static IReadOnlyList<IConnectionFilter> Filters => _filters;
-
-    /// <summary>
-    /// Registers a gate (inversion of control, mirroring <c>BanChannel.Register</c>). Idempotent by
-    /// <see cref="IConnectionFilter.Name"/>. Filters are consulted in registration order, so register
-    /// the cheapest and most selective first — core registers the firewall before content is swept.
-    /// </summary>
-    public static void Register(IConnectionFilter filter)
-    {
-        if (filter == null)
-        {
-            return;
-        }
-
-        var filters = _filters;
-        for (var i = 0; i < filters.Length; i++)
-        {
-            if (filters[i].Name == filter.Name)
-            {
-                return;
-            }
-        }
-
-        filter.Register();
-
-        var updated = new IConnectionFilter[_filters.Length + 1];
-        Array.Copy(_filters, updated, _filters.Length);
-        updated[^1] = filter;
-        _filters = updated;
-
-        logger.Information("Registered connection filter '{Name}'", filter.Name);
-    }
-
-    /// <summary>
-    /// True when any filter denies the connection. Short-circuits on the first denial;
-    /// <paramref name="deniedBy"/> names it for logging.
-    /// </summary>
-    public static bool ShouldDeny(IPAddress address, out string deniedBy)
-    {
-        var filters = _filters;
-        for (var i = 0; i < filters.Length; i++)
-        {
-            // A faulty filter must not take down the accept loop for every connection.
-            try
-            {
-                if (filters[i].ShouldDeny(address))
-                {
-                    deniedBy = filters[i].Name;
-                    return true;
-                }
-            }
-            catch (Exception e)
-            {
-                Disable(filters[i], e);
-            }
-        }
-
-        deniedBy = null;
-        return false;
-    }
-
-    /// <summary>
-    /// Drops a filter that threw on the accept path: one that faults once faults for every subsequent
-    /// connection, costing an exception and a log line per accept. Failing open is deliberate — a broken
-    /// filter must not be able to deny every connection either.
-    /// </summary>
-    private static void Disable(IConnectionFilter filter, Exception e)
-    {
-        logger.Error(e, "Connection filter '{Name}' threw on the accept path; unregistering it", filter.Name);
-
-        var filters = _filters;
-        var updated = new List<IConnectionFilter>(filters.Length);
-        for (var i = 0; i < filters.Length; i++)
-        {
-            if (!ReferenceEquals(filters[i], filter))
-            {
-                updated.Add(filters[i]);
-            }
-        }
-
-        _filters = updated.ToArray();
-    }
-
-    public static void Start(CancellationToken token)
-    {
-        var filters = _filters;
-        for (var i = 0; i < filters.Length; i++)
-        {
-            var filter = filters[i];
-            try
-            {
-                filter.Start(token);
-            }
-            catch (Exception e)
-            {
-                // A filter that cannot hydrate must not crash boot; it simply denies nothing.
-                logger.Error(e, "Connection filter '{Name}' failed to start; continuing without it", filter.Name);
-            }
-        }
-    }
-
-    public static void Stop()
-    {
-        var filters = _filters;
-        for (var i = 0; i < filters.Length; i++)
-        {
-            var filter = filters[i];
-            try
-            {
-                filter.Stop();
-            }
-            catch (Exception e)
-            {
-                logger.Warning(e, "Connection filter '{Name}' threw while stopping", filter.Name);
-            }
-        }
-    }
-
-    internal static void ResetForTesting() => _filters = [];
-}

Projects/Server/Network/Firewall/CidrFirewallEntry.cs

@@ -25,15 +25,8 @@ public class CidrFirewallEntry : BaseFirewallEntry
     public override UInt128 MaxIpAddress { get; }
 
     public CidrFirewallEntry(string ipAddressOrCidr)
+        : this(ParseIPAddress(ipAddressOrCidr, out var prefixLength), prefixLength)
     {
-        // Core owns the CIDR -> normalized range parse.
-        if (!IPAddressUtility.TryParseCidrRange(ipAddressOrCidr, out var min, out var max))
-        {
-            throw new ArgumentException("Invalid IP address or CIDR.", nameof(ipAddressOrCidr));
-        }
-
-        MinIpAddress = min;
-        MaxIpAddress = max;
     }
 
     public CidrFirewallEntry(IPAddress minAddress, IPAddress maxAddress)
@@ -57,4 +50,26 @@ public class CidrFirewallEntry : BaseFirewallEntry
         MaxIpAddress = Utility.CreateCidrAddress(bytes, prefixLength, true);
     }
 
+    private static IPAddress ParseIPAddress(ReadOnlySpan<char> ipString, out int prefixLength)
+    {
+        var slashIndex = ipString.IndexOf('/');
+        var ipAddress = IPAddress.Parse(slashIndex > -1 ? ipString[..slashIndex] : ipString);
+        var maxPrefixLength = ipAddress.AddressFamily == AddressFamily.InterNetworkV6 ? 128 : 32;
+
+        if (slashIndex == -1)
+        {
+            prefixLength = maxPrefixLength;
+        }
+        else
+        {
+            var prefixPart = ipString[(slashIndex + 1)..];
+
+            if (!int.TryParse(prefixPart, out prefixLength) || prefixLength < 0 || prefixLength > maxPrefixLength)
+            {
+                throw new ArgumentException("Invalid prefix length.");
+            }
+        }
+
+        return ipAddress;
+    }
 }

Projects/Server/Network/Firewall/Firewall.cs

@@ -0,0 +1,168 @@
+/*************************************************************************
+ * ModernUO                                                              *
+ * Copyright 2019-2026 - ModernUO Development Team                       *
+ * Email: hi@modernuo.com                                                *
+ * File: Firewall.cs                                                     *
+ *                                                                       *
+ * This program is free software: you can redistribute it and/or modify  *
+ * it under the terms of the GNU General Public License as published by  *
+ * the Free Software Foundation, either version 3 of the License, or     *
+ * (at your option) any later version.                                   *
+ *                                                                       *
+ * You should have received a copy of the GNU General Public License     *
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>. *
+ *************************************************************************/
+
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Net;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+namespace Server.Network;
+
+public static class Firewall
+{
+    [ThreadStatic]
+    private static InternalValidationEntry _validationEntry;
+    private static readonly ConcurrentDictionary<IPAddress, int> _isBlockedCache = [];
+    private static readonly ReaderWriterLockSlim _firewallLock = new(LockRecursionPolicy.NoRecursion);
+
+    private static int _firewallVersion;
+    private static readonly SortedSet<IFirewallEntry> _firewallSet = [];
+
+    public static int FirewallSetCount => _firewallSet.Count;
+
+    public static void ReadFirewallSet(Action<IReadOnlySet<IFirewallEntry>> callback)
+    {
+        _firewallLock.EnterReadLock();
+        try
+        {
+            callback(_firewallSet);
+        }
+        finally
+        {
+            _firewallLock.ExitReadLock();
+        }
+    }
+
+    internal static bool IsBlocked(IPAddress address)
+    {
+        if (_isBlockedCache.TryGetValue(address, out var blockVersion) && blockVersion == _firewallVersion)
+        {
+            return true;
+        }
+
+        if (_validationEntry == null)
+        {
+            _validationEntry = new InternalValidationEntry(address);
+        }
+        else
+        {
+            _validationEntry.Address = address;
+        }
+
+        if (CheckBlocked(_validationEntry))
+        {
+            _isBlockedCache[address] = _firewallVersion;
+            return true;
+        }
+
+        return false;
+    }
+
+    private static bool CheckBlocked(IFirewallEntry validationEntry)
+    {
+        if (_firewallSet.Count == 0)
+        {
+            return false;
+        }
+
+        _firewallLock.EnterReadLock();
+        try
+        {
+            var min = _firewallSet.Min;
+            if (validationEntry.CompareTo(min) < 0)
+            {
+                return false;
+            }
+
+            // Get all entries that are lower than our validation entry
+            var view = _firewallSet.GetViewBetween(min, validationEntry);
+
+            // Loop backward since there shouldn't be any entries where the Min address is higher than ours
+            foreach (var firewallEntry in view.Reverse())
+            {
+                if (firewallEntry.IsBlocked(validationEntry.MinIpAddress))
+                {
+                    return true;
+                }
+            }
+
+            return view.Max?.IsBlocked(validationEntry.MinIpAddress) == true;
+        }
+        finally
+        {
+            _firewallLock.ExitReadLock();
+        }
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static bool Add(IFirewallEntry firewallEntry)
+    {
+        _firewallLock.EnterWriteLock();
+        try
+        {
+            if (_firewallSet.Add(firewallEntry))
+            {
+                Interlocked.Increment(ref _firewallVersion); // Update version
+                return true;
+            }
+            return false;
+        }
+        finally
+        {
+            _firewallLock.ExitWriteLock();
+        }
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static bool Remove(IFirewallEntry entry)
+    {
+        if (entry == null)
+        {
+            return false;
+        }
+
+        _firewallLock.EnterWriteLock();
+        try
+        {
+            if (_firewallSet.Remove(entry))
+            {
+                Interlocked.Increment(ref _firewallVersion); // Update version
+                return true;
+            }
+            return false;
+        }
+        finally
+        {
+            _firewallLock.ExitWriteLock();
+        }
+    }
+
+    private class InternalValidationEntry : BaseFirewallEntry
+    {
+        private UInt128 _address;
+
+        public IPAddress Address
+        {
+            set => _address = value.ToUInt128();
+        }
+
+        public override UInt128 MinIpAddress => _address;
+        public override UInt128 MaxIpAddress => _address;
+
+        public InternalValidationEntry(IPAddress ipAddress) => Address = ipAddress;
+    }
+}

Projects/Server/Network/ForeignProtocol.cs

@@ -1,146 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2026 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: ForeignProtocol.cs                                              *
- *                                                                       *
- * This program is free software: you can redistribute it and/or modify  *
- * it under the terms of the GNU General Public License as published by  *
- * the Free Software Foundation, either version 3 of the License, or     *
- * (at your option) any later version.                                   *
- *                                                                       *
- * You should have received a copy of the GNU General Public License     *
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- *************************************************************************/
-
-using System;
-
-namespace Server.Network;
-
-public enum ForeignProtocolKind
-{
-    None,
-    Http,
-    Tls,
-    Ssh
-}
-
-public enum ForeignProtocolMatch
-{
-    None,
-
-    /// <summary>A prefix matched, but more bytes are needed to be sure.</summary>
-    Incomplete,
-
-    Confirmed
-}
-
-/// <summary>
-/// Identifies traffic that is positively some OTHER protocol (HTTP, TLS, SSH), rather than deciding whether
-/// a connection is a good Ultima Online client.
-/// </summary>
-/// <remarks>
-/// The direction matters. A legitimate client with encryption enabled when the shard expects none sends a
-/// structurally correct connection whose payload is noise, because <c>LoginEncryption.ClientDecrypt</c> is a
-/// byte-for-byte stream XOR: length survives, content does not. So "unreadable" cannot mean "hostile", while
-/// "speaks HTTP" safely can. Nothing here assumes arrival framing; see
-/// <c>dev-docs/ip-bans-and-allowlists.md</c>.
-/// </remarks>
-public static class ForeignProtocol
-{
-    private const int RequiredBytes = 8;
-    private const int MaxTlsRecordLength = 16384;
-
-    public static ForeignProtocolMatch Identify(ReadOnlySpan<byte> buffer, out ForeignProtocolKind kind)
-    {
-        kind = ForeignProtocolKind.None;
-
-        // Too little to match a prefix; the caller's own short-read handling covers it.
-        if (buffer.Length < 4)
-        {
-            return ForeignProtocolMatch.None;
-        }
-
-        var candidate = MatchPrefix(buffer);
-        if (candidate == ForeignProtocolKind.None)
-        {
-            return ForeignProtocolMatch.None;
-        }
-
-        if (buffer.Length < RequiredBytes)
-        {
-            return ForeignProtocolMatch.Incomplete;
-        }
-
-        if (!Confirm(buffer, candidate))
-        {
-            return ForeignProtocolMatch.None;
-        }
-
-        kind = candidate;
-        return ForeignProtocolMatch.Confirmed;
-    }
-
-    private static ForeignProtocolKind MatchPrefix(ReadOnlySpan<byte> buffer)
-    {
-        // TLS handshake record: content type 0x16, major version 3, minor version 0..4 (SSL 3.0 - TLS 1.3).
-        if (buffer[0] == 0x16 && buffer[1] == 0x03 && buffer[2] <= 0x04)
-        {
-            return ForeignProtocolKind.Tls;
-        }
-
-        if (StartsWith(buffer, "SSH-"))
-        {
-            return ForeignProtocolKind.Ssh;
-        }
-
-        // HTTP request methods. Four bytes only selects a candidate; Confirm checks the request line.
-        if (StartsWith(buffer, "GET ") || StartsWith(buffer, "POST") || StartsWith(buffer, "HEAD") ||
-            StartsWith(buffer, "PUT ") || StartsWith(buffer, "OPTI") || StartsWith(buffer, "DELE") ||
-            StartsWith(buffer, "CONN") || StartsWith(buffer, "TRAC") || StartsWith(buffer, "PATC"))
-        {
-            return ForeignProtocolKind.Http;
-        }
-
-        return ForeignProtocolKind.None;
-    }
-
-    private static bool Confirm(ReadOnlySpan<byte> buffer, ForeignProtocolKind candidate)
-    {
-        if (candidate == ForeignProtocolKind.Tls)
-        {
-            // A seed can collide with the 0x16 0x03 0x0? prefix (that is just the address 22.3.x.x), so
-            // require a ClientHello inside a plausible record.
-            var recordLength = (buffer[3] << 8) | buffer[4];
-            return buffer[5] == 0x01 && recordLength is >= 4 and <= MaxTlsRecordLength;
-        }
-
-        // A UO client's fifth byte is a packet id (0x80, 0x91, 0xEF), none of them printable, so requiring
-        // the request line to continue in ASCII lets a seed that spells "GET " fall through.
-        for (var i = 4; i < buffer.Length && i < 16; i++)
-        {
-            if (!IsPrintableAscii(buffer[i]))
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    private static bool IsPrintableAscii(byte value) =>
-        value is >= 0x20 and <= 0x7E or (byte)'\r' or (byte)'\n' or (byte)'\t';
-
-    private static bool StartsWith(ReadOnlySpan<byte> buffer, string ascii)
-    {
-        for (var i = 0; i < ascii.Length; i++)
-        {
-            if (buffer[i] != (byte)ascii[i])
-            {
-                return false;
-            }
-        }
-
-        return true;
-    }
-}

Projects/Server/Network/IConnectionFilter.cs

@@ -1,60 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2026 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: IConnectionFilter.cs                                            *
- *                                                                       *
- * This program is free software: you can redistribute it and/or modify  *
- * it under the terms of the GNU General Public License as published by  *
- * the Free Software Foundation, either version 3 of the License, or     *
- * (at your option) any later version.                                   *
- *                                                                       *
- * You should have received a copy of the GNU General Public License     *
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- *************************************************************************/
-
-using System.Net;
-using System.Threading;
-
-namespace Server.Network;
-
-/// <summary>
-/// A gate consulted for every inbound connection, before the socket is configured and before any
-/// per-connection allocation. Implementations decide membership only — the accept path neither knows
-/// nor cares where a filter's data comes from, so a filter may be a handful of admin-curated entries,
-/// a millions-strong list hydrated from a file, or a query against something else entirely. Core owns
-/// the question; content owns every answer (see <c>Firewall</c> and <c>BlocklistFilter</c> in UOContent).
-/// </summary>
-/// <remarks>
-/// <para>
-/// <see cref="ShouldDeny"/> runs on the game loop once per accepted socket, which is the path that has
-/// to survive a DDoS. Implementations MUST be allocation-free and O(log n) at worst, MUST NOT perform
-/// I/O, and MUST NOT block. Anything expensive (parsing, reloading, reporting to an external service)
-/// belongs off the loop or behind a bounded, non-blocking enqueue.
-/// </para>
-/// <para>
-/// Side effects that a hit implies (contributing to <c>BanChannel</c>, promoting to an OS firewall,
-/// suppressing duplicate reports) are the filter's own business, not the accept path's. This is why
-/// <see cref="ShouldDeny"/> returns a bare bool: the accept path asks one question and does one thing.
-/// </para>
-/// </remarks>
-public interface IConnectionFilter
-{
-    /// <summary>Stable id for logging/config (e.g. <c>firewall</c>, <c>blocklist</c>).</summary>
-    string Name { get; }
-
-    /// <summary>Reads configuration. Called by <see cref="ConnectionFilters.Register"/>. No I/O beyond config.</summary>
-    void Register();
-
-    /// <summary>Starts any background hydration. The token is cancelled on shutdown.</summary>
-    void Start(CancellationToken token);
-
-    /// <summary>Flushes and tears down. Called during shutdown.</summary>
-    void Stop();
-
-    /// <summary>
-    /// True to deny the connection. Must be allocation-free and non-blocking; see the remarks on
-    /// <see cref="IConnectionFilter"/>.
-    /// </summary>
-    bool ShouldDeny(IPAddress address);
-}

Projects/Server/Network/NetState/NetState.Network.cs

@@ -19,7 +19,6 @@ using System.Linq;
 using System.Net;
 using System.Net.NetworkInformation;
 using System.Network;
-using System.Numerics;
 
 namespace Server.Network;
 
@@ -29,10 +28,9 @@ namespace Server.Network;
 public partial class NetState
 {
     // Buffer sizes
-    private const int RecvBufferSize = 1024 * 64;    // 64KB recv buffers
+    private const int RecvBufferSize = 1024 * 64;   // 64KB recv buffers
-    private const int DefaultSendBufferSize = 1024 * 256;  // 256KB send buffers
+    private const int SendBufferSize = 1024 * 256;  // 256KB send buffers
-    private const int MinSendBufferSize = 1024 * 64;       // Platform allocation granularity
+    private const int MaxConnections = 4096;        // Max concurrent connections
-    private const int MaxConnections = 4096;         // Max concurrent connections
 
     private static readonly Queue<NetState> _disposed = [];
     private static readonly TimeSpan ConnectingSocketIdleLimit = TimeSpan.FromMilliseconds(5000); // 5 seconds
@@ -43,9 +41,7 @@ public partial class NetState
     // NetState storage indexed by RingSocket.Id
     private static readonly NetState[] _netStates = new NetState[MaxConnections];
 
-    // Events buffer for ProcessCompletions. Bounded by one event per peeked completion
+    // Events buffer for ProcessCompletions
-    // (maxSockets), doubled for headroom. Undersizing drops DataReceived events whose bytes were
-    // already committed, leaving them unparsed until the next recv completes.
     private static readonly RingSocketEvent[] _events = new RingSocketEvent[MaxConnections * 2];
 
     // Listener management
@@ -71,24 +67,6 @@ public partial class NetState
         _socketManager?.WaitForCompletion(timeoutMs);
     }
 
-    /// <summary>
-    /// Wakes the game loop if it is blocked in <see cref="WaitForCompletion"/>. Safe from any
-    /// thread; a no-op before networking is configured or after teardown. The signal is sticky,
-    /// so a wake racing the loop's decision to sleep is not lost.
-    /// </summary>
-    public static void Wake()
-    {
-        _socketManager?.Ring?.Wake();
-    }
-
-    /// <summary>
-    /// True when no queued network work remains for the loop to drain. <see cref="Slice"/> defers
-    /// work in several places, so an empty completion queue alone is not enough.
-    /// </summary>
-    internal static bool IsIdle =>
-        _throttled.Count == 0 && _throttledPending.Count == 0 &&
-        _flushPending.Count == 0 && _pendingDisconnects.Count == 0 && _disposed.Count == 0;
-
     /// <summary>
     /// Gets the listening addresses that the server is bound to.
     /// </summary>
@@ -110,61 +88,20 @@ public partial class NetState
         // Initialize IP rate limiter
         _ipRateLimiter = new IPRateLimiter(10, 10000, 1000, 2.0, 3_600_000, Core.ClosingTokenSource.Token);
 
-        // Sends in flight per connection; honoured by RIO only (see IIORingGroup). Costs a
-        // request-queue and completion-queue slot per send, not another buffer. Worst-case added
-        // latency is roughly completion RTT / this value.
-        var maxOutstandingSends = ServerConfiguration.GetOrUpdateSetting("network.maxOutstandingSends", 32);
-
         // Initialize IORingGroup
-        var ring = IORingGroup.Create(
+        var ring = IORingGroup.Create(queueSize: MaxConnections * 2, maxConnections: MaxConnections);
-            queueSize: MaxConnections * 2,
-            maxConnections: MaxConnections,
-            maxOutstandingSends: maxOutstandingSends
-        );
-
-        // Per-connection send buffer: the lever for "send buffer exhausted" disconnects, and the
-        // per-connection memory ceiling.
-        var sendBufferSize = GetSendBufferSize();
 
         // Create socket manager which handles buffer pools and socket lifecycle
         _socketManager = new RingSocketManager(
             ring,
             maxSockets: MaxConnections,
             recvBufferSize: RecvBufferSize,
-            sendBufferSize: sendBufferSize,
+            sendBufferSize: SendBufferSize,
             initialBufferSlabs: 8,
             maxBufferSlabs: 32
         );
     }
 
-    /// <summary>
-    /// Reads the configured send buffer size, coerced to a power of two of at least the platform
-    /// allocation granularity. IORingBuffer requires this and would otherwise throw at socket
-    /// creation rather than at startup.
-    /// </summary>
-    private static int GetSendBufferSize()
-    {
-        var configured = ServerConfiguration.GetOrUpdateSetting("network.sendBufferSize", DefaultSendBufferSize);
-        var size = Math.Max(MinSendBufferSize, configured);
-
-        if (!BitOperations.IsPow2(size))
-        {
-            size = (int)BitOperations.RoundUpToPowerOf2((uint)size);
-        }
-
-        if (size != configured)
-        {
-            logger.Warning(
-                "network.sendBufferSize {Configured} is not a power of two of at least {Minimum}; using {Adjusted}",
-                configured,
-                MinSendBufferSize,
-                size
-            );
-        }
-
-        return size;
-    }
-
     /// <summary>
     /// Starts the network server on configured listening addresses.
     /// </summary>
@@ -287,19 +224,10 @@ public partial class NetState
                 if (_ipRateLimiter != null && !_ipRateLimiter.Verify(remoteIP, out var totalAttempts))
                 {
                     logger.Debug("{Address} Past IP limit threshold ({TotalAttempts})", remoteIP, totalAttempts);
-
-                    if (Bans.BanConfiguration.Settings.ReportRateLimitTrips)
-                    {
-                        // Enqueue-only contribution; NOT added to the local firewall set (the limiter already
-                        // gates it here and the OS bouncer drops it at the kernel).
-                        Bans.BanChannel.Report(remoteIP, Bans.BanConfiguration.Settings.AutoBanDuration, Bans.BanReasons.RateLimit);
-                    }
                 }
-                else if (ConnectionFilters.ShouldDeny(remoteIP, out var deniedBy))
+                else if (Firewall.IsBlocked(remoteIP))
                 {
-                    // Whatever a hit implies (persisting, promoting to an OS bouncer, contributing to the
+                    logger.Debug("{Address} Firewalled", remoteIP);
-                    // ban channel) is the filter's own business; the accept path just drops the socket.
-                    logger.Debug("{Address} denied by connection filter '{Filter}'", remoteIP, deniedBy);
                 }
                 else
                 {
@@ -380,18 +308,6 @@ public partial class NetState
             // Socket must have finished the entire authentication process or be forcibly disconnected
             if (!ns.SentFirstPacket || !ns.Seeded)
             {
-                // Only the totally silent ones are evidence. A connection that sent SOME data and ran out of
-                // time is far more likely a slow link, and banning those makes the player retry, trip the
-                // rate limiter, and compound it into an hours-long ban.
-                if (!ns._receivedData && Bans.BanConfiguration.Settings.ReportBadConnects)
-                {
-                    Bans.BanChannel.Report(
-                        ns.Address,
-                        Bans.BanConfiguration.Settings.BadConnectDuration,
-                        Bans.BanReasons.SilentConnect
-                    );
-                }
-
                 ns.Disconnect(null);
 
                 // Force immediate cleanup - these are unauthenticated connections
@@ -568,11 +484,6 @@ public partial class NetState
             return;
         }
 
-        if (bytesReceived > 0)
-        {
-            ns._receivedData = true;
-        }
-
         // Data is already committed to buffer by RingSocketManager
         // Decode if encryption is enabled
         ns.DecryptRecvBuffer(bytesReceived);

Projects/Server/Network/NetState/NetState.cs

@@ -60,10 +60,6 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
     internal ProtocolState _protocolState = ProtocolState.AwaitingSeed;
     private bool _packetLogging;
 
-    // Whether ANY inbound bytes have arrived: what separates a slow client from a socket held open on
-    // purpose. See BanSettings.ReportBadConnects.
-    internal bool _receivedData;
-
     // Managed socket with buffers (handles lifecycle automatically)
     internal RingSocket _socket;
 
@@ -448,36 +444,17 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
         }
 
         var length = span.Length;
-        if (length <= 0)
+        if (length <= 0 || !GetSendBuffer(out var buffer))
         {
             return;
         }
 
-        // Never drop silently: the client would stay connected while missing game state.
-        if (!GetSendBuffer(out var buffer))
-        {
-            SendBufferExhausted(length, 0);
-            return;
-        }
-
         try
         {
             // Apply encoding first (e.g., compression from UOContent)
             if (CompressionEnabled)
             {
                 length = NetworkCompression.Compress(span, buffer);
-
-                // 0 means nothing was written, whether it did not fit or the input was too large.
-                if (length <= 0)
-                {
-                    SendBufferExhausted(span.Length, buffer.Length);
-                    return;
-                }
-            }
-            else if (span.Length > buffer.Length)
-            {
-                SendBufferExhausted(span.Length, buffer.Length);
-                return;
             }
             else
             {
@@ -507,31 +484,6 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
         }
     }
 
-    /// <summary>
-    /// Handles a packet that cannot be placed in the send buffer.
-    /// </summary>
-    /// <remarks>
-    /// High unacked means a slow client holding the buffer; needed approaching capacity means the
-    /// buffer is too small for this shard and network.sendBufferSize should be raised.
-    /// </remarks>
-    private void SendBufferExhausted(int needed, int writable)
-    {
-        var sendBuffer = _socket?.SendBuffer;
-        var unacked = sendBuffer?.InFlightBytes ?? 0;
-        var capacity = sendBuffer?.PhysicalSize ?? 0;
-
-        logger.Warning(
-            "{NetState}: send buffer exhausted - needed {Needed} bytes, {Writable} writable, {Unacked} awaiting acknowledgement, {Capacity} capacity. Raise network.sendBufferSize (power of two) if this recurs on healthy connections.",
-            this,
-            needed,
-            writable,
-            unacked,
-            capacity
-        );
-
-        Disconnect($"Send buffer exhausted (needed {needed}, writable {writable}, unacked {unacked}, capacity {capacity})");
-    }
-
     private void StartPacketLog()
     {
         try
@@ -625,37 +577,6 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
                     {
                         case ProtocolState.AwaitingSeed:
                             {
-                                // Traffic that is positively another protocol. Unlike "does not look like a
-                                // good client", this cannot misfire on a misconfigured one.
-                                var foreign = ForeignProtocol.Identify(buffer, out var foreignKind);
-
-                                if (foreign == ForeignProtocolMatch.Incomplete)
-                                {
-                                    _parserState = ParserState.AwaitingPartialPacket;
-                                    break;
-                                }
-
-                                if (foreign == ForeignProtocolMatch.Confirmed)
-                                {
-                                    logger.Debug(
-                                        "{Address} spoke {Protocol} on the game port; disconnecting",
-                                        Address,
-                                        foreignKind
-                                    );
-
-                                    if (Bans.BanConfiguration.Settings.ReportBadConnects)
-                                    {
-                                        Bans.BanChannel.Report(
-                                            Address,
-                                            Bans.BanConfiguration.Settings.BadConnectDuration,
-                                            Bans.BanReasons.ForeignProtocol
-                                        );
-                                    }
-
-                                    Disconnect(string.Empty);
-                                    return;
-                                }
-
                                 if (packetId == 0xEF)
                                 {
                                     _parserState = ParserState.ProcessingPacket;
@@ -671,18 +592,6 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
 
                                     if (newSeed == 0)
                                     {
-                                        // No real client sends a zero seed, so this is deliberate garbage
-                                        // rather than a damaged connection — unlike the short-read branch
-                                        // below, which a fragmented first segment can reach honestly.
-                                        if (Bans.BanConfiguration.Settings.ReportBadConnects)
-                                        {
-                                            Bans.BanChannel.Report(
-                                                Address,
-                                                Bans.BanConfiguration.Settings.BadConnectDuration,
-                                                Bans.BanReasons.InvalidSeed
-                                            );
-                                        }
-
                                         Disconnect(string.Empty);
                                         return;
                                     }
@@ -694,11 +603,8 @@ public partial class NetState : IComparable<NetState>, IValueLinkListNode<NetSta
                                     _parserState = ParserState.AwaitingNextPacket;
                                     _protocolState = ProtocolState.GameServer_AwaitingGameServerLogin;
                                 }
-                                else
+                                else // Don't allow partial packets on initial connection, just disconnect them.
                                 {
-                                    // Disconnect rather than wait. Waiting would hold a connection slot for
-                                    // the full ConnectingSocketIdleLimit per one- or two-byte client, which
-                                    // is what a flood sends. Only pre-0xEF clients reach here.
                                     Disconnect(string.Empty);
                                 }
                                 break;

Projects/Server/Network/NetworkCompression.cs

@@ -73,9 +73,7 @@ public static class NetworkCompression
 
     public static int Compress(ReadOnlySpan<byte> input, Span<byte> output)
     {
-        // output.Length < 4 underflows safeOutputLength below (nuint), defeating the hot loop's
+        if (input.Length > DefiniteOverflow)
-        // bounds check. Reachable whenever the send buffer is nearly full.
-        if (input.Length > DefiniteOverflow || output.Length < 4)
         {
             return 0;
         }

Projects/Server/PropertyList/ObjectPropertyList.cs

@@ -55,12 +55,6 @@ public sealed class ObjectPropertyList : IPropertyList, IDisposable
     private int _pos;
     private char[]? _arrayToReturnToPool;
 
-    /// <summary>
-    /// True while GetProperties is populating this list. Set by the owning entity so a nested
-    /// InvalidateProperties can be refused instead of Reset()ing a build already in flight.
-    /// </summary>
-    internal bool IsBuilding { get; set; }
-
     public ObjectPropertyList(IEntity? e)
     {
         Entity = e;
@@ -325,23 +319,8 @@ public sealed class ObjectPropertyList : IPropertyList, IDisposable
     private static int GetDefaultLength(int literalLength, int formattedCount) =>
         Math.Max(256, literalLength + formattedCount * 11);
 
-    // Reset()/Dispose() return the scratch buffer to the pool. If either lands while a `$"..."`
-    // handler is still appending, re-rent rather than spanning a null array and throwing out of
-    // GetProperties. Mobile/Item hold the primary guard; this covers any other caller.
-    [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    private void EnsureInterpolationBuffer()
-    {
-        if (_arrayToReturnToPool == null)
-        {
-            _arrayToReturnToPool = STArrayPool<char>.Shared.Rent(256);
-            _pos = 0;
-        }
-    }
-
     public void AppendLiteral(string value)
     {
-        EnsureInterpolationBuffer();
-
         if (value.Length == 1)
         {
             var chars = _arrayToReturnToPool.AsSpan();
@@ -375,8 +354,6 @@ public sealed class ObjectPropertyList : IPropertyList, IDisposable
 
     public void AppendFormatted<T>(T value)
     {
-        EnsureInterpolationBuffer();
-
         string? s;
         if (value is IFormattable)
         {
@@ -407,11 +384,9 @@ public sealed class ObjectPropertyList : IPropertyList, IDisposable
 
     public void AppendFormatted<T>(T value, string? format)
     {
-        EnsureInterpolationBuffer();
+        // We support localization '#' cliloc formatter for custom property lists
-
+        // This allows someone to build an IPropertyList that creates HTML using the same syntax as LocalizationInterpolationHandler
-        // '#' marks an integer argument as a cliloc ("#<value>"). Integers only -- a float/double/decimal
+        if (format == "#")
-        // '#' is the standard numeric format, not a cliloc marker.
-        if (format == "#" && value is int or uint or long or ulong or short or ushort or byte or sbyte)
         {
             AppendLiteral("#");
             format = null;
@@ -467,8 +442,6 @@ public sealed class ObjectPropertyList : IPropertyList, IDisposable
 
     public void AppendFormatted(ReadOnlySpan<char> value)
     {
-        EnsureInterpolationBuffer();
-
         if (value.TryCopyTo(_arrayToReturnToPool.AsSpan(_pos..)))
         {
             _pos += value.Length;
@@ -481,8 +454,6 @@ public sealed class ObjectPropertyList : IPropertyList, IDisposable
 
     public void AppendFormatted(ReadOnlySpan<char> value, int alignment = 0, string? format = null)
     {
-        EnsureInterpolationBuffer();
-
         var leftAlign = false;
         if (alignment < 0)
         {
@@ -517,8 +488,6 @@ public sealed class ObjectPropertyList : IPropertyList, IDisposable
 
     public void AppendFormatted(string? value)
     {
-        EnsureInterpolationBuffer();
-
         if (value?.TryCopyTo(_arrayToReturnToPool.AsSpan(_pos..)) == true)
         {
             _pos += value.Length;

Projects/Server/Serialization/BinaryFileReader.cs

@@ -74,12 +74,6 @@ public sealed unsafe class BinaryFileReader : IDisposable, IGenericReader
     /// </summary>
     public long Position => _reader.Position;
 
-    public TimeSpan AnchoredTimeShift
-    {
-        get => _reader.AnchoredTimeShift;
-        set => _reader.AnchoredTimeShift = value;
-    }
-
     public void Dispose()
     {
         _accessor?.SafeMemoryMappedViewHandle.ReleasePointer();

Projects/Server/Serialization/BufferReader.cs

@@ -37,8 +37,6 @@ public class BufferReader : IGenericReader
     public long Position => _position;
     public long BufferSize => _buffer.Length;
 
-    public TimeSpan AnchoredTimeShift { get; set; }
-
     public BufferReader(byte[] buffer, Dictionary<ulong, string> typesDb = null, Encoding encoding = null)
     {
         _buffer = buffer;

Projects/Server/Serialization/BufferWriter.cs

@@ -384,7 +384,6 @@ public class BufferWriter : IGenericWriter
     }
 
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
-    [Obsolete("Delta time rewrites its bytes on every save. Write anchored time instead (WriteAnchoredTime, or [AnchoredDateTime] on generated fields); bump the containing type's version, as the wire format changes. Existing delta payloads remain readable through ReadDeltaTime in old-version fallbacks.")]
     public void WriteDeltaTime(DateTime value)
     {
         if (value == DateTime.MinValue)
@@ -408,21 +407,6 @@ public class BufferWriter : IGenericWriter
         Write(value.Ticks - DateTime.UtcNow.Ticks);
     }
 
-    /// <summary>
-    /// Writes the absolute value; <see cref="IGenericReader.ReadAnchoredTime" /> re-bases it
-    /// by the elapsed time since the save started, so downtime does not age it and an
-    /// unchanged value serializes to identical bytes.
-    /// </summary>
-    public void WriteAnchoredTime(DateTime value)
-    {
-        if (value.Kind == DateTimeKind.Local)
-        {
-            value = value.ToUniversalTime();
-        }
-
-        Write(value.Ticks);
-    }
-
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public void Write(IPAddress value)
     {

Projects/Server/Serialization/GenericEntityPersistence.cs

@@ -114,10 +114,9 @@ public class GenericEntityPersistence<T> : GenericPersistence, IGenericEntityPer
         using var binFs = new FileStream(
             Path.Combine(dir, $"{Name}.bin"), FileMode.Create, FileAccess.Write, FileShare.None, 1024 * 1024
         );
-        // v4 records are fixed-width 26 bytes; the v5 header carries the save-start anchor
+        // v4 records are fixed-width 26 bytes; the header carries the type table
-        // and the type table (name lengths vary — 64 bytes per entry is a staging hint, not
+        // (name lengths vary — 64 bytes per entry is a staging hint, not a contract).
-        // a contract).
+        var expectedIdxSize = 12 + 26L * EntitiesBySerial.Count + 64L * _typeTable.Count;
-        var expectedIdxSize = 20 + 26L * EntitiesBySerial.Count + 64L * _typeTable.Count;
         using var idx = new FileBufferWriter(Path.Combine(dir, $"{Name}.idx"), expectedIdxSize);
 
         var binPosition = 0L;
@@ -143,10 +142,7 @@ public class GenericEntityPersistence<T> : GenericPersistence, IGenericEntityPer
             binPosition += _selfLength;
         }
 
-        idx.Write(5); // Version
+        idx.Write(4); // Version
-
-        // One anchor for the whole save: the world is frozen from the moment it is stamped.
-        idx.Write(World.SaveStartTime.Ticks);
 
         // The type table is fully known at freeze (AddEntity diverts to the pending
         // queues while saving) and is written before the records so the loader can
@@ -498,18 +494,6 @@ public class GenericEntityPersistence<T> : GenericPersistence, IGenericEntityPer
 
         var version = dataReader.ReadInt();
 
-        if (version >= 5)
-        {
-            // Re-base anchored timestamps by the elapsed time since the save started.
-            var anchor = new DateTime(dataReader.ReadLong(), DateTimeKind.Utc);
-            var shift = Core.Now - anchor;
-            _anchoredTimeShift = anchor.Ticks > 0 && shift > TimeSpan.Zero ? shift : TimeSpan.Zero;
-
-            // The whole save shares one anchor. Publish it so payloads without their own
-            // (GenericPersistence bins) can shift too; indexes load before any of them.
-            World.LoadTimeShift = _anchoredTimeShift;
-        }
-
         if (version >= 4)
         {
             DeserializeIndexesV4(dataReader, entities);
@@ -676,9 +660,6 @@ public class GenericEntityPersistence<T> : GenericPersistence, IGenericEntityPer
 
     private static List<T> _toDelete;
 
-    // From the loaded idx (v5+); zero when the save predates the anchor.
-    private TimeSpan _anchoredTimeShift;
-
     private unsafe void InternalDeserialize(string filePath, int index, Dictionary<ulong, string> typesDb)
     {
         using var mmf = MemoryMappedFile.CreateFromFile(filePath, FileMode.Open);
@@ -686,10 +667,7 @@ public class GenericEntityPersistence<T> : GenericPersistence, IGenericEntityPer
 
         byte* ptr = null;
         accessor.SafeMemoryMappedViewHandle.AcquirePointer(ref ptr);
-        var dataReader = new UnmanagedDataReader(ptr, accessor.Length, typesDb)
+        var dataReader = new UnmanagedDataReader(ptr, accessor.Length, typesDb);
-        {
-            AnchoredTimeShift = _anchoredTimeShift
-        };
 
         Deserialize(dataReader);
 

Projects/Server/Serialization/GenericPersistence.cs

@@ -98,13 +98,7 @@ public abstract class GenericPersistence : Persistence, IGenericSerializable
 
             byte* ptr = null;
             accessor.SafeMemoryMappedViewHandle.AcquirePointer(ref ptr);
-            var dataReader = new UnmanagedDataReader(ptr, accessor.Length, typesDb)
+            var dataReader = new UnmanagedDataReader(ptr, accessor.Length, typesDb);
-            {
-                // These payloads carry no anchor of their own; they inherit the save-wide
-                // shift stamped while the entity indexes were read (indexes always load
-                // before persistence payloads — see Persistence.Load).
-                AnchoredTimeShift = World.LoadTimeShift
-            };
             Deserialize(dataReader);
 
             error = dataReader.Position != fileLength

Projects/Server/Serialization/IGenericReader.cs

@@ -43,12 +43,6 @@ public interface IGenericReader
     DateTime ReadDateTime() => new(ReadLong(), DateTimeKind.Utc);
     TimeSpan ReadTimeSpan() => new(ReadLong());
 
-    /// <summary>
-    /// Decodes a legacy delta-time value. Only for reading old-version payloads (version
-    /// fallbacks and migration replays) — current formats store anchored time and read it
-    /// with <see cref="ReadAnchoredTime" />. <see cref="IGenericWriter.WriteDeltaTime" /> is
-    /// obsolete: no current-version format may write delta time.
-    /// </summary>
     DateTime ReadDeltaTime()
     {
         return ReadLong() switch
@@ -58,37 +52,6 @@ public interface IGenericReader
             var delta     => new DateTime(delta + DateTime.UtcNow.Ticks, DateTimeKind.Utc)
         };
     }
-
-    /// <summary>
-    /// Elapsed time between the loaded save starting and this load, applied by
-    /// <see cref="ReadAnchoredTime" />. Zero when the source carries no anchor.
-    /// </summary>
-    TimeSpan AnchoredTimeShift => TimeSpan.Zero;
-
-    DateTime ReadAnchoredTime()
-    {
-        var value = ReadDateTime();
-
-        if (value == DateTime.MinValue || value == DateTime.MaxValue)
-        {
-            return value;
-        }
-
-        var shift = AnchoredTimeShift;
-        if (shift == TimeSpan.Zero)
-        {
-            return value;
-        }
-
-        var ticks = value.Ticks + shift.Ticks;
-
-        if (ticks >= DateTime.MaxValue.Ticks)
-        {
-            return DateTime.MaxValue;
-        }
-
-        return ticks <= 0 ? DateTime.MinValue : new DateTime(ticks, DateTimeKind.Utc);
-    }
     decimal ReadDecimal() => new([ReadInt(), ReadInt(), ReadInt(), ReadInt()]);
     int ReadEncodedInt()
     {

Projects/Server/Serialization/IGenericWriter.cs

@@ -40,11 +40,7 @@ public interface IGenericWriter
     void Write(decimal value);
     void WriteEncodedInt(int value);
     void Write(DateTime value);
-
-    [Obsolete("Delta time rewrites its bytes on every save. Write anchored time instead (WriteAnchoredTime, or [AnchoredDateTime] on generated fields); bump the containing type's version, as the wire format changes. Existing delta payloads remain readable through ReadDeltaTime in old-version fallbacks.")]
     void WriteDeltaTime(DateTime value);
-
-    void WriteAnchoredTime(DateTime value);
     void Write(IPAddress value);
     void Write(TimeSpan value);
     void Write(Point3D value);

Projects/Server/Serialization/UnmanagedDataReader.cs

@@ -43,8 +43,6 @@ public unsafe class UnmanagedDataReader : IGenericReader
     /// </summary>
     public long Position { get; private set; }
 
-    public TimeSpan AnchoredTimeShift { get; set; }
-
     /// <summary>
     /// Read bits of data raw from a serialized file using Little-endian.
     /// </summary>

Projects/Server/Server.csproj

@@ -34,13 +34,14 @@
     </Target>
     <ItemGroup>
         <ProjectReference Include="..\Logger\Logger.csproj" />
-        <PackageReference Include="IORingGroup" Version="1.0.10" />
+        <PackageReference Include="IORingGroup" Version="1.0.7" />
         <PackageReference Include="CommunityToolkit.HighPerformance" Version="8.4.2" />
-        <PackageReference Include="LibDeflate.Bindings" Version="1.0.4" />
+        <PackageReference Include="LibDeflate.Bindings" Version="1.0.3" />
-        <PackageReference Include="System.IO.Hashing" Version="10.0.11" />
+        <PackageReference Include="System.IO.Hashing" Version="10.0.10" />
 
-        <PackageReference Include="ModernUO.Serialization.Annotations" Version="4.0.0" />
+        <PackageReference Include="ModernUO.Serialization.Annotations" Version="2.14.2" />
-        <PackageReference Include="ModernUO.Serialization.Generator" Version="4.0.0" PrivateAssets="all" />
+        <PackageReference Include="ModernUO.Serialization.Generator" Version="2.14.3" />
+        <PackageReference Update="Serilog" Version="4.4.0" />
     </ItemGroup>
     <ItemGroup>
         <AdditionalFiles Include="Migrations/*.v*.json" />

Projects/Server/Timer/Timer.TimerWheel.cs

@@ -51,15 +51,8 @@ public partial class Timer
         }
     }
 
-    /// <summary>
-    /// Milliseconds of simulated time one wheel turn advances.
-    /// </summary>
-    public static int TickRate => _tickRate;
-
     public static void Slice(long tickCount)
     {
-        EventLoopProfiler.WheelSlice(tickCount - _lastTickTurned);
-
         var deltaSinceTurn = tickCount - _lastTickTurned;
         while (deltaSinceTurn >= _tickRate)
         {

Projects/Server/Utilities/IPAddressUtility.cs

@@ -1,240 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2026 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: IPAddressUtility.cs                                             *
- *                                                                       *
- * This program is free software: you can redistribute it and/or modify  *
- * it under the terms of the GNU General Public License as published by  *
- * the Free Software Foundation, either version 3 of the License, or     *
- * (at your option) any later version.                                   *
- *                                                                       *
- * You should have received a copy of the GNU General Public License     *
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- *************************************************************************/
-
-using System;
-using System.Buffers.Binary;
-using System.Net;
-using System.Net.Sockets;
-using System.Numerics;
-
-namespace Server;
-
-/// <summary>
-/// Low-level IPAddress conversion and parsing helpers shared by the firewall, ban channel, and
-/// blocklist. All members are allocation-free (stack buffers only) so they are safe on hot accept
-/// paths and inside tight parse loops.
-/// </summary>
-public static class IPAddressUtility
-{
-    // Converts an IPAddress to a UInt128 in IPv6 format.
-    // The IsIPv4MappedToIPv6 clause below looks redundant (the BCL only ever sets it on InterNetworkV6),
-    // but it guards the v4 -> UInt128 -> IPAddress round-trip, which can return a mapped v6 address for
-    // what is really a v4 one.
-    //TODO Rework as an explicit "to canonical v6 bits" step that needs no family check
-    //     (see dev-docs/networking-packets.md, "IP Address Normalization")
-    public static UInt128 ToUInt128(this IPAddress ip)
-    {
-        if (ip.AddressFamily == AddressFamily.InterNetwork && !ip.IsIPv4MappedToIPv6)
-        {
-            Span<byte> integer = stackalloc byte[4];
-            return !ip.TryWriteBytes(integer, out _)
-                ? (UInt128)0
-                : new UInt128(0, 0xFFFF00000000UL | BinaryPrimitives.ReadUInt32BigEndian(integer));
-        }
-
-        Span<byte> bytes = stackalloc byte[16];
-        if (!ip.TryWriteBytes(bytes, out _))
-        {
-            return 0;
-        }
-
-        var high = BinaryPrimitives.ReadUInt64BigEndian(bytes[..8]);
-        var low = BinaryPrimitives.ReadUInt64BigEndian(bytes.Slice(8, 8));
-
-        return new UInt128(high, low);
-    }
-
-    // Converts a UInt128 in IPv6 format to an IPAddress
-    public static IPAddress ToIpAddress(this UInt128 value, bool mapToIpv6 = false)
-    {
-        // IPv4 mapped IPv6 address
-        if (!mapToIpv6 && value >= 0xFFFF00000000UL && value <= 0xFFFFFFFFFFFFUL)
-        {
-            var newAddress = IPAddress.HostToNetworkOrder((int)value);
-            return new IPAddress(unchecked((uint)newAddress));
-        }
-
-        Span<byte> bytes = stackalloc byte[16]; // 128 bits for IPv6 address
-        ((IBinaryInteger<UInt128>)value).WriteBigEndian(bytes);
-
-        return new IPAddress(bytes);
-    }
-
-    /// <summary>
-    /// Parses <c>a.b.c.d/n</c>, <c>::/n</c>, or a bare address (treated as a single-host range) into an
-    /// inclusive <see cref="UInt128"/> range in normalized IPv6 form. A bare IPv4 prefix is widened by 96
-    /// bits so v4 and v6 ranges are directly comparable. Returns false on anything malformed.
-    /// </summary>
-    public static bool TryParseCidrRange(ReadOnlySpan<char> cidr, out UInt128 min, out UInt128 max)
-    {
-        min = default;
-        max = default;
-
-        var slash = cidr.IndexOf('/');
-        if (!IPAddress.TryParse(slash >= 0 ? cidr[..slash] : cidr, out var ip))
-        {
-            return false;
-        }
-
-        var isV6 = ip.AddressFamily == AddressFamily.InterNetworkV6;
-        var maxPrefixLength = isV6 ? 128 : 32;
-        int prefixLength;
-
-        if (slash < 0)
-        {
-            prefixLength = maxPrefixLength;
-        }
-        else if (!int.TryParse(cidr[(slash + 1)..], out prefixLength) ||
-                 prefixLength < 0 || prefixLength > maxPrefixLength)
-        {
-            return false;
-        }
-
-        if (!isV6)
-        {
-            prefixLength += 96; // 32 -> 128
-        }
-
-        Span<byte> bytes = stackalloc byte[16];
-        ip.WriteMappedIPv6To(bytes);
-
-        min = Utility.CreateCidrAddress(bytes, prefixLength, false);
-        max = Utility.CreateCidrAddress(bytes, prefixLength, true);
-        return true;
-    }
-
-    /// <summary>Extracts the big-endian uint of an <see cref="AddressFamily.InterNetwork"/> address.</summary>
-    public static bool TryV4(IPAddress ip, out uint v)
-    {
-        Span<byte> b = stackalloc byte[4];
-        if (ip.TryWriteBytes(b, out var n) && n == 4)
-        {
-            v = ((uint)b[0] << 24) | ((uint)b[1] << 16) | ((uint)b[2] << 8) | b[3];
-            return true;
-        }
-
-        v = 0;
-        return false;
-    }
-
-    /// <summary>
-    /// Extracts the embedded v4 uint from a v4-mapped-v6 address directly from the mapped bytes,
-    /// avoiding the allocation of <see cref="IPAddress.MapToIPv4"/>.
-    /// </summary>
-    public static bool TryMappedV4(IPAddress ip, out uint v)
-    {
-        Span<byte> b = stackalloc byte[16];
-        if (ip.TryWriteBytes(b, out var n) && n == 16)
-        {
-            v = ((uint)b[12] << 24) | ((uint)b[13] << 16) | ((uint)b[14] << 8) | b[15];
-            return true;
-        }
-
-        v = 0;
-        return false;
-    }
-
-    /// <summary>Parses a dotted-quad IPv4 literal into a big-endian uint. Allocation-free, strict.</summary>
-    public static bool TryParseV4(ReadOnlySpan<char> s, out uint v)
-    {
-        v = 0;
-        uint acc = 0;
-        int octet = 0, digits = 0, dots = 0;
-        for (var i = 0; i < s.Length; i++)
-        {
-            var c = s[i];
-            if (c == '.')
-            {
-                if (digits == 0 || octet > 255)
-                {
-                    return false;
-                }
-
-                acc = (acc << 8) | (uint)octet;
-                dots++;
-                octet = 0;
-                digits = 0;
-            }
-            else if (c is >= '0' and <= '9')
-            {
-                octet = octet * 10 + (c - '0');
-                if (++digits > 3)
-                {
-                    return false;
-                }
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        if (dots != 3 || digits == 0 || octet > 255)
-        {
-            return false;
-        }
-
-        v = (acc << 8) | (uint)octet;
-        return true;
-    }
-
-    /// <summary>
-    /// UTF-8/ASCII byte overload of <see cref="TryParseV4(ReadOnlySpan{char}, out uint)"/>, mirroring its
-    /// validation exactly so the blocklist can parse dotted-quads straight from file bytes with no
-    /// per-line string allocation.
-    /// </summary>
-    public static bool TryParseV4(ReadOnlySpan<byte> s, out uint v)
-    {
-        v = 0;
-        uint acc = 0;
-        int octet = 0, digits = 0, dots = 0;
-        for (var i = 0; i < s.Length; i++)
-        {
-            var c = s[i];
-            if (c == (byte)'.')
-            {
-                if (digits == 0 || octet > 255)
-                {
-                    return false;
-                }
-
-                acc = (acc << 8) | (uint)octet;
-                dots++;
-                octet = 0;
-                digits = 0;
-            }
-            else if (c is >= (byte)'0' and <= (byte)'9')
-            {
-                octet = octet * 10 + (c - '0');
-                if (++digits > 3)
-                {
-                    return false;
-                }
-            }
-            else
-            {
-                return false;
-            }
-        }
-
-        if (dots != 3 || digits == 0 || octet > 255)
-        {
-            return false;
-        }
-
-        v = (acc << 8) | (uint)octet;
-        return true;
-    }
-}

Projects/Server/Utilities/NetworkUtilities.cs

@@ -1,7 +1,6 @@
-using System;
 using System.Net;
 using System.Net.Sockets;
-using Server.Collections;
+using Server.Network;
 
 namespace Server;
 
@@ -15,42 +14,36 @@ public static class NetworkUtilities
             _                            => false
         };
 
-    // These are constant reserved ranges, not firewall entries -- they only ever answer "is this address
+    private static readonly IFirewallEntry[] _privateNetworkV4 =
-    // in one of these blocks?", which is exactly what SortedRangeIndex is for. Building them through the
+    [
-    // firewall entry types was a convenience that made core depend on the firewall for something that has
+        new CidrFirewallEntry("127.0.0.1/8"),
-    // nothing to do with banning.
+        new CidrFirewallEntry("192.168.0.0/16"),
-    private static readonly SortedRangeIndex<UInt128> _privateNetworkV4 = BuildIndex(
+        new CidrFirewallEntry("10.0.0.0/8"),
-        "127.0.0.1/8",
+        new CidrFirewallEntry("172.16.0.0/12"),
-        "192.168.0.0/16",
+        new CidrFirewallEntry("169.254.0.0/16"),
-        "10.0.0.0/8",
+        new CidrFirewallEntry("100.64.0.0/10")
-        "172.16.0.0/12",
+    ];
-        "169.254.0.0/16",
-        "100.64.0.0/10"
-    );
 
-    private static readonly SortedRangeIndex<UInt128> _privateNetworkV6 = BuildIndex(
+    private static readonly IFirewallEntry[] _privateNetworkV6 =
-        "fc00::/7",
+    [
-        "fe80::/10"
+        new CidrFirewallEntry("fc00::/7"),
-    );
+        new CidrFirewallEntry("fe80::/10")
+    ];
 
-    private static SortedRangeIndex<UInt128> BuildIndex(params ReadOnlySpan<string> cidrs)
+    public static bool IsPrivateNetworkV4(this IPAddress ip)
     {
-        var ranges = new SortedRangeIndex<UInt128>.Range[cidrs.Length];
+        for (var i = 0; i < _privateNetworkV4.Length; i++)
-        for (var i = 0; i < cidrs.Length; i++)
         {
-            if (!IPAddressUtility.TryParseCidrRange(cidrs[i], out var min, out var max))
+            if (_privateNetworkV4[i].IsBlocked(ip))
             {
-                throw new ArgumentException($"Invalid reserved-network CIDR \"{cidrs[i]}\"");
+                return true;
             }
-
-            ranges[i] = new SortedRangeIndex<UInt128>.Range(min, max);
         }
 
-        Array.Sort(ranges, SortedRangeIndex<UInt128>.ByMin);
+        return false;
-        return SortedRangeIndex<UInt128>.Build(ranges);
     }
 
-    public static bool IsPrivateNetworkV4(this IPAddress ip) => _privateNetworkV4.Contains(ip.ToUInt128());
+    public static bool IsPrivateNetworkV6(this IPAddress ip) =>
-
+        _privateNetworkV6[0].IsBlocked(ip) ||
-    public static bool IsPrivateNetworkV6(this IPAddress ip) => _privateNetworkV6.Contains(ip.ToUInt128());
+        _privateNetworkV6[1].IsBlocked(ip);
 }

Projects/Server/Utilities/Utility.cs

@@ -108,6 +108,45 @@ public static partial class Utility
         }
     }
 
+    // Converts an IPAddress to a UInt128 in IPv6 format
+    public static UInt128 ToUInt128(this IPAddress ip)
+    {
+        if (ip.AddressFamily == AddressFamily.InterNetwork && !ip.IsIPv4MappedToIPv6)
+        {
+            Span<byte> integer = stackalloc byte[4];
+            return !ip.TryWriteBytes(integer, out _)
+                ? (UInt128)0
+                : new UInt128(0, 0xFFFF00000000UL | BinaryPrimitives.ReadUInt32BigEndian(integer));
+        }
+
+        Span<byte> bytes = stackalloc byte[16];
+        if (!ip.TryWriteBytes(bytes, out _))
+        {
+            return 0;
+        }
+
+        var high = BinaryPrimitives.ReadUInt64BigEndian(bytes[..8]);
+        var low = BinaryPrimitives.ReadUInt64BigEndian(bytes.Slice(8, 8));
+
+        return new UInt128(high, low);
+    }
+
+    // Converts a UInt128 in IPv6 format to an IPAddress
+    public static IPAddress ToIpAddress(this UInt128 value, bool mapToIpv6 = false)
+    {
+        // IPv4 mapped IPv6 address
+        if (!mapToIpv6 && value >= 0xFFFF00000000UL && value <= 0xFFFFFFFFFFFFUL)
+        {
+            var newAddress = IPAddress.HostToNetworkOrder((int)value);
+            return new IPAddress(unchecked((uint)newAddress));
+        }
+
+        Span<byte> bytes = stackalloc byte[16]; // 128 bits for IPv6 address
+        ((IBinaryInteger<UInt128>)value).WriteBigEndian(bytes);
+
+        return new IPAddress(bytes);
+    }
+
     [MethodImpl(MethodImplOptions.AggressiveInlining)]
     public static UInt128 CreateCidrAddress(ReadOnlySpan<byte> bytes, int prefixLength, bool isMax)
     {
@@ -1050,16 +1089,28 @@ public static partial class Utility
             return;
         }
 
+        using var queue = PooledRefQueue<K>.Create();
         foreach (var (key, value) in dictionary)
         {
-            var deleted = serializableKey
+            if (serializableKey)
-                ? ((ISerializable)key).Deleted
-                : value == null || ((ISerializable)value).Deleted;
-
-            if (deleted)
             {
-                dictionary.Remove(key);
+                if (key == null || ((ISerializable)key).Deleted)
+                {
+                    queue.Enqueue(key);
+                }
             }
+            else
+            {
+                if (value == null || ((ISerializable)value).Deleted)
+                {
+                    queue.Enqueue(key);
+                }
+            }
+        }
+
+        while (queue.Count > 0)
+        {
+            dictionary.Remove(queue.Dequeue());
         }
 
         dictionary.TrimExcess();

Projects/Server/World/World.cs

@@ -93,21 +93,6 @@ public static class World
     public static string SavePath { get; private set; }
     public static WorldState WorldState { get; private set; }
     public static bool Saving => WorldState == WorldState.Saving;
-
-    /// <summary>
-    /// UTC time the current or most recent world save started. Written into save indexes so
-    /// anchored timestamps can be re-based by the downtime at load.
-    /// </summary>
-    public static DateTime SaveStartTime { get; internal set; }
-
-    /// <summary>
-    /// The anchored-time shift for the save currently being loaded: the downtime between the
-    /// save's start and this load. Stamped while entity indexes are read (they all carry the
-    /// same anchor, since the whole save shares one <see cref="SaveStartTime" />) and applied
-    /// to every reader of that save's files — including <see cref="GenericPersistence" />
-    /// payloads, which carry no anchor of their own. Zero for saves that predate the anchor.
-    /// </summary>
-    public static TimeSpan LoadTimeShift { get; internal set; }
     public static bool Running => WorldState is not WorldState.Loading and not WorldState.Initial;
     public static bool Loading => WorldState == WorldState.Loading;
 
@@ -302,10 +287,6 @@ public static class World
 
         WorldState = WorldState.Saving;
 
-        // The world is frozen from here: one anchor for the whole save. Written into save
-        // indexes so anchored timestamps can be re-based by the downtime at load.
-        SaveStartTime = Core.Now;
-
         Broadcast(0x35, true, "The world is saving, please wait.");
 
         logger.Information("Saving world");

Projects/UOContent.Tests/Fixtures/TestServerInitializer.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Reflection;
 using System.Threading;
@@ -61,15 +61,6 @@ internal static class TestServerInitializer
             AssemblyHandler.LoadAssemblies(["Server.dll", "UOContent.dll"]);
 
             SkillsInfo.Configure();
-
-            // Seed the loop clock as Main.cs does before the Configure sweep; otherwise Core.Now is
-            // DateTime.MinValue for the whole test host.
-            Core._now = DateTime.UtcNow;
-
-            // Timer wheel must exist before NetState.Configure(), which schedules a recurring
-            // sweep via Timer.DelayCall (matches production ordering in Main.cs: Timer.Init runs
-            // before AssemblyHandler.Invoke("Configure")).
-            Timer.Init(0);
             Server.Network.NetState.Configure();
             TestMapDefinitions.ConfigureTestMapDefinitions();
 
@@ -100,8 +91,7 @@ internal static class TestServerInitializer
             }
 
             World.Configure();
-            // Registers the Accounts entity persistence; without it no test can construct an Account.
+            Timer.Init(0);
-            Server.Accounting.Accounts.Configure();
             RaceDefinitions.Configure();
             MovementImpl.Configure();
             PathFollower.Configure();

Projects/UOContent.Tests/Tests/Accounting/AccountPasswordTests.cs

@@ -1,74 +0,0 @@
-using System;
-using Server.Accounting;
-using Server.Accounting.Security;
-using Xunit;
-
-namespace Server.Tests.Accounting;
-
-[Collection("Sequential UOContent Tests")]
-public class AccountPasswordTests : IDisposable
-{
-    private const string Password = "hunter2";
-
-    // CurrentAlgorithm is process-wide state shared with the rest of the collection.
-    private readonly PasswordProtectionAlgorithm _originalAlgorithm = AccountSecurity.CurrentAlgorithm;
-
-    public void Dispose() => AccountSecurity.CurrentAlgorithm = _originalAlgorithm;
-
-    [Theory]
-    [InlineData(PasswordProtectionAlgorithm.SHA1)]
-    [InlineData(PasswordProtectionAlgorithm.SHA2)]
-    [InlineData(PasswordProtectionAlgorithm.PBKDF2)]
-    [InlineData(PasswordProtectionAlgorithm.Argon2)]
-    public void NewAccount_CanLogIn(PasswordProtectionAlgorithm algorithm)
-    {
-        AccountSecurity.CurrentAlgorithm = algorithm;
-        var account = new Account($"new-{algorithm}-user", Password);
-
-        Assert.Equal(algorithm, account.PasswordAlgorithm);
-        Assert.True(account.CheckPassword(Password));
-        Assert.False(account.CheckPassword("wrong-password"));
-    }
-
-    // SetPassword assigns PasswordAlgorithm before deriving the phrase from it. Reversed, the hash
-    // is salted by the outgoing algorithm's rule but stored under the incoming one, which verifies
-    // once and then never again.
-    [Theory]
-    [InlineData(PasswordProtectionAlgorithm.SHA1)]
-    [InlineData(PasswordProtectionAlgorithm.SHA2)]
-    [InlineData(PasswordProtectionAlgorithm.PBKDF2)]
-    public void UpgradingAlgorithm_DoesNotLockTheAccountOut(PasswordProtectionAlgorithm from)
-    {
-        AccountSecurity.CurrentAlgorithm = from;
-        var account = new Account($"upgrade-{from}-user", Password);
-        Assert.True(account.CheckPassword(Password));
-
-        AccountSecurity.CurrentAlgorithm = PasswordProtectionAlgorithm.Argon2;
-
-        Assert.True(account.CheckPassword(Password));
-        Assert.Equal(PasswordProtectionAlgorithm.Argon2, account.PasswordAlgorithm);
-
-        // Must verify against what the rehash wrote.
-        Assert.True(account.CheckPassword(Password));
-        Assert.False(account.CheckPassword("wrong-password"));
-    }
-
-    [Fact]
-    public void StaleArgon2Parameters_AreRehashedOnLogin()
-    {
-        AccountSecurity.CurrentAlgorithm = PasswordProtectionAlgorithm.Argon2;
-        var account = new Account("stale-params-user", Password);
-
-        // The shipping default before this change: Argon2i, m=8192, t=3, p=1.
-        account.Password =
-            "$argon2i$v=19$m=8192,t=3,p=1$LD1XJz7P3wQmIJ+Tu6ScgA$NO5hBABsHQ172C5nDO2X4gWnB4jDef3x6WhLdVE2LFw";
-
-        Assert.True(account.CheckPassword(Password));
-        Assert.StartsWith("$argon2id$v=19$m=16384,t=1,p=1$", account.Password);
-
-        // Already current: verifying again must not rewrite the hash.
-        var afterFirst = account.Password;
-        Assert.True(account.CheckPassword(Password));
-        Assert.Equal(afterFirst, account.Password);
-    }
-}

Projects/UOContent.Tests/Tests/Accounting/PasswordWorkerTests.cs

@@ -1,229 +0,0 @@
-using System;
-using System.Threading;
-using Server.Accounting;
-using Server.Accounting.Security;
-using Xunit;
-
-namespace Server.Tests.Accounting;
-
-[Collection("Sequential UOContent Tests")]
-public class PasswordWorkerTests : IDisposable
-{
-    private const string Password = "hunter2";
-
-    private readonly PasswordProtectionAlgorithm _originalAlgorithm = AccountSecurity.CurrentAlgorithm;
-
-    public PasswordWorkerTests() => AccountSecurity.CurrentAlgorithm = PasswordProtectionAlgorithm.Argon2;
-
-    public void Dispose() => AccountSecurity.CurrentAlgorithm = _originalAlgorithm;
-
-    private static Account CreateAccount(string username) =>
-        Accounts.GetAccount(username) as Account ?? new Account(username, Password);
-
-    /// <summary>
-    /// Enqueues work, then pumps the loop context until <paramref name="complete"/> or the deadline.
-    ///
-    /// The context pins itself to the thread that constructed it and refuses <c>ExecuteTasks</c>
-    /// from any other. The fixture's belongs to whichever thread built the fixture, and xUnit gives
-    /// no guarantee that a test method runs on that thread even inside a sequential collection --
-    /// so this owns one for the duration and puts the original back. Pumping the fixture's context
-    /// passed locally and failed on CI.
-    /// </summary>
-    private static void PumpUntil(Action enqueue, Func<bool> complete, int timeoutSeconds = 20)
-    {
-        var original = Core.LoopContext;
-        var owned = new EventLoopContext();
-        Core.LoopContext = owned;
-
-        try
-        {
-            enqueue();
-
-            var deadline = DateTime.UtcNow.AddSeconds(timeoutSeconds);
-
-            while (!complete() && DateTime.UtcNow < deadline)
-            {
-                owned.ExecuteTasks();
-                Thread.Sleep(5);
-            }
-
-            // Anything that landed between the last pump and the final check.
-            owned.ExecuteTasks();
-        }
-        finally
-        {
-            Core.LoopContext = original;
-        }
-    }
-
-    private static PasswordJob JobFor(Account account, string submitted) =>
-        new()
-        {
-            Account = account,
-            StoredHash = account.Password,
-            VerifyPhrase = account.GetVerifyPhrase(submitted),
-            HashPhrase = account.NeedsPasswordUpgrade() ? account.GetRehashPhrase(submitted) : null,
-            StoredAlgorithm = account.PasswordAlgorithm,
-            TargetAlgorithm = AccountSecurity.CurrentAlgorithm
-        };
-
-    /// <summary>
-    /// Drives the real queue rather than <c>ComputeInline</c>. A job with no NetState attached -- an
-    /// admin password change -- was being dropped by the liveness check, which read a null State as
-    /// a dead connection, so the change silently never happened and its callback never fired.
-    /// </summary>
-    [Fact]
-    public void RunsAJobThatHasNoConnectionAttached()
-    {
-        var account = CreateAccount("offloop-no-netstate-user");
-        var applied = false;
-
-        var job = new PasswordJob
-        {
-            Account = account,
-            HashPhrase = account.GetRehashPhrase("a-queued-password"),
-            TargetAlgorithm = AccountSecurity.CurrentAlgorithm,
-            OnComplete = (_, outcome) => applied = outcome.Hash != null
-        };
-
-        PumpUntil(() => Assert.True(PasswordWorker.TryEnqueue(job)), () => applied);
-
-        Assert.True(applied);
-        Assert.True(account.CheckPassword("a-queued-password"));
-    }
-
-    [Fact]
-    public void VerifiesTheCorrectPassword()
-    {
-        var account = CreateAccount("offloop-correct-user");
-
-        var outcome = PasswordWorker.ComputeInline(JobFor(account, Password));
-
-        Assert.True(outcome.Verified);
-    }
-
-    [Fact]
-    public void RejectsTheWrongPassword()
-    {
-        var account = CreateAccount("offloop-wrong-user");
-
-        var outcome = PasswordWorker.ComputeInline(JobFor(account, "not-the-password"));
-
-        Assert.False(outcome.Verified);
-        Assert.Null(outcome.Hash);
-    }
-
-    [Fact]
-    public void ProducesNoUpgradeWhenParametersAreCurrent()
-    {
-        var account = CreateAccount("offloop-current-user");
-
-        var outcome = PasswordWorker.ComputeInline(JobFor(account, Password));
-
-        Assert.True(outcome.Verified);
-        Assert.Null(outcome.Hash);
-    }
-
-    [Fact]
-    public void ProducesAnUpgradeWhenParametersAreStale()
-    {
-        var account = CreateAccount("offloop-stale-user");
-
-        // The shipping default before #2562: Argon2i, m=8192, t=3, p=1.
-        account.Password =
-            "$argon2i$v=19$m=8192,t=3,p=1$LD1XJz7P3wQmIJ+Tu6ScgA$NO5hBABsHQ172C5nDO2X4gWnB4jDef3x6WhLdVE2LFw";
-
-        var outcome = PasswordWorker.ComputeInline(JobFor(account, Password));
-
-        Assert.True(outcome.Verified);
-        Assert.StartsWith("$argon2id$v=19$m=16384,t=1,p=1$", outcome.Hash);
-    }
-
-    [Fact]
-    public void ProducesNoUpgradeWhenThePasswordIsWrong()
-    {
-        var account = CreateAccount("offloop-wrong-stale-user");
-        account.Password =
-            "$argon2i$v=19$m=8192,t=3,p=1$LD1XJz7P3wQmIJ+Tu6ScgA$NO5hBABsHQ172C5nDO2X4gWnB4jDef3x6WhLdVE2LFw";
-
-        var outcome = PasswordWorker.ComputeInline(JobFor(account, "not-the-password"));
-
-        Assert.False(outcome.Verified);
-        Assert.Null(outcome.Hash);
-    }
-
-    [Fact]
-    public void AppliesAWrite()
-    {
-        var account = CreateAccount("offloop-apply-user");
-        var upgraded = Argon2PasswordProtection.Instance.EncryptPassword(Password);
-
-        account.ApplyPasswordWrite(upgraded, PasswordProtectionAlgorithm.Argon2);
-
-        Assert.Equal(upgraded, account.Password);
-        Assert.True(account.CheckPassword(Password));
-    }
-
-    /// <summary>
-    /// Writes apply in dispatch order, which is what makes a guard unnecessary: dispatch is on the
-    /// loop, one worker drains FIFO, and results return through the loop context in that same order.
-    /// A second worker thread would break this and would need ordering reintroduced.
-    /// </summary>
-    [Fact]
-    public void WritesApplyInDispatchOrder()
-    {
-        var account = CreateAccount("offloop-two-writes-user");
-        var done = 0;
-
-        PumpUntil(
-            () =>
-            {
-                for (var i = 1; i <= 2; i++)
-                {
-                    Assert.True(
-                        PasswordWorker.TryEnqueue(
-                            new PasswordJob
-                            {
-                                Account = account,
-                                HashPhrase = account.GetRehashPhrase($"password-{i}"),
-                                StoredAlgorithm = account.PasswordAlgorithm,
-                                TargetAlgorithm = AccountSecurity.CurrentAlgorithm,
-                                OnComplete = (_, _) => done++
-                            }
-                        )
-                    );
-                }
-            },
-            () => done >= 2
-        );
-
-        Assert.Equal(2, done);
-        Assert.True(account.CheckPassword("password-2"));
-        Assert.False(account.CheckPassword("password-1"));
-    }
-
-    [Theory]
-    [InlineData(PasswordProtectionAlgorithm.SHA1)]
-    [InlineData(PasswordProtectionAlgorithm.SHA2)]
-    public void UsesTheUsernameSaltedPhraseForShaAccounts(PasswordProtectionAlgorithm algorithm)
-    {
-        AccountSecurity.CurrentAlgorithm = algorithm;
-        var account = CreateAccount($"offloop-phrase-{algorithm}-user");
-
-        // Verification must use the algorithm the hash was stored under...
-        Assert.Equal($"{account.Username}{Password}", account.GetVerifyPhrase(Password));
-
-        // ...and a rehash the one it is moving to. Swapping these is the #2562 lockout.
-        AccountSecurity.CurrentAlgorithm = PasswordProtectionAlgorithm.Argon2;
-        Assert.Equal(Password, account.GetRehashPhrase(Password));
-    }
-
-    [Fact]
-    public void UsesTheBarePasswordForArgon2Accounts()
-    {
-        var account = CreateAccount("offloop-phrase-argon2-user");
-
-        Assert.Equal(Password, account.GetVerifyPhrase(Password));
-        Assert.Equal(Password, account.GetRehashPhrase(Password));
-    }
-}

Projects/UOContent.Tests/Tests/Accounting/Security/PasswordProtectionTest.cs

@@ -74,89 +74,4 @@ public class PasswordProtectionTest
 
         Assert.False(passwordProtection.ValidatePassword(encryptedPassword, "Not the same password"));
     }
-
-    /// <summary>
-    /// Literal digests of <see cref="plainPassword"/>, so the stored format cannot drift. These are
-    /// compared as strings against what is already in every account database -- a casing or encoding
-    /// change would lock out every SHA and MD5 account on the shard at once.
-    /// </summary>
-    [Theory]
-    [InlineData("MD5", "52284053181040AC90DBDE74A0E7FF5E")]
-    [InlineData("SHA1", "9AC635509803AAE2D8312BA1879289259A50C5F0")]
-    [InlineData(
-        "SHA2",
-        "5A727BFF8F8E08A24BDF6B0CD5065F30A1F8E0060B857BB8AFD6955BE0ACBC489DA63F19B8F4CF08D73DE4069CF4B" +
-        "29D94B353F31513B2FB2D9382EFE15AE975"
-    )]
-    public void HashAlgorithm_StoredFormatIsStable(string algorithmType, string expected)
-    {
-        var protection = algorithmType switch
-        {
-            "SHA1" => HashAlgorithmPasswordProtection.SHA1Instance,
-            "SHA2" => HashAlgorithmPasswordProtection.SHA2Instance,
-            _      => HashAlgorithmPasswordProtection.MD5Instance,
-        };
-
-        Assert.Equal(expected, protection.EncryptPassword(plainPassword));
-        Assert.True(protection.ValidatePassword(expected, plainPassword));
-    }
-
-    // The shipping default before this change, as a literal so it cannot drift with the configured
-    // defaults. Password: "hunter2".
-    private const string LegacyArgon2iHash =
-        "$argon2i$v=19$m=8192,t=3,p=1$LD1XJz7P3wQmIJ+Tu6ScgA$NO5hBABsHQ172C5nDO2X4gWnB4jDef3x6WhLdVE2LFw";
-
-    [Fact]
-    public void Argon2_ValidatesLegacyArgon2iHash()
-    {
-        Assert.True(Argon2PasswordProtection.Instance.ValidatePassword(LegacyArgon2iHash, "hunter2"));
-        Assert.False(Argon2PasswordProtection.Instance.ValidatePassword(LegacyArgon2iHash, "wrong"));
-    }
-
-    [Theory]
-    // type, memory, time, parallelism -> expected NeedsRehash
-    [InlineData("argon2id", 16384, 1, 1, false)] // current defaults
-    [InlineData("argon2i", 8192, 3, 1, true)]    // the old shipping default
-    [InlineData("argon2id", 8192, 1, 1, true)]   // right type, stale memory
-    [InlineData("argon2id", 16384, 3, 1, true)]  // right type, stale iterations
-    [InlineData("argon2id", 16384, 1, 2, true)]  // right type, stale parallelism
-    [InlineData("argon2i", 16384, 1, 1, true)]   // right cost, stale type
-    public void Argon2_NeedsRehash_ComparesTypeAndCost(
-        string type, int memory, int time, int parallelism, bool expected
-    )
-    {
-        var hash = $"${type}$v=19$m={memory},t={time},p={parallelism}$" +
-                   "LD1XJz7P3wQmIJ+Tu6ScgA$NO5hBABsHQ172C5nDO2X4gWnB4jDef3x6WhLdVE2LFw";
-
-        Assert.Equal(expected, Argon2PasswordProtection.Instance.NeedsRehash(hash));
-    }
-
-    // Digest and salt lengths are decoded base64 sizes rather than parameter-list entries, so they
-    // need their own literals. Current type and cost throughout; only a length differs.
-    [Theory]
-    // 16-byte digest: 22 base64 chars instead of the 43 a 32-byte digest encodes to.
-    [InlineData("$argon2id$v=19$m=16384,t=1,p=1$LD1XJz7P3wQmIJ+Tu6ScgA$NO5hBABsHQ172C5nDO2X4g")]
-    // 8-byte salt: 11 base64 chars instead of the 22 a 16-byte salt encodes to.
-    [InlineData("$argon2id$v=19$m=16384,t=1,p=1$LD1XJz7P3wQ$NO5hBABsHQ172C5nDO2X4gWnB4jDef3x6WhLdVE2LFw")]
-    public void Argon2_NeedsRehash_ComparesSaltAndDigestLengths(string hash)
-    {
-        Assert.True(Argon2PasswordProtection.Instance.NeedsRehash(hash));
-    }
-
-    [Theory]
-    [InlineData("")]
-    [InlineData("not-a-hash")]
-    public void Argon2_NeedsRehash_IsTrueForUnparseableHashes(string hash)
-    {
-        Assert.True(Argon2PasswordProtection.Instance.NeedsRehash(hash));
-    }
-
-    [Fact]
-    public void NonArgon2Protections_NeverNeedRehash()
-    {
-        Assert.False(PBKDF2PasswordProtection.Instance.NeedsRehash("anything"));
-        Assert.False(HashAlgorithmPasswordProtection.SHA2Instance.NeedsRehash("anything"));
-        Assert.False(HashAlgorithmPasswordProtection.SHA1Instance.NeedsRehash("anything"));
-        Assert.False(HashAlgorithmPasswordProtection.MD5Instance.NeedsRehash("anything"));
-    }
 }

Projects/UOContent.Tests/Tests/Commands/Objects/CagTreeBuilderTests.cs

@@ -0,0 +1,80 @@
+using System.Linq;
+using Server.Commands;
+using Server.Items;
+using Xunit;
+
+namespace UOContent.Tests.Commands.Objects;
+
+[Collection("Sequential UOContent Tests")]
+public class CagTreeBuilderTests
+{
+    [Fact]
+    public void BuildTree_creates_nested_categories_and_resolves_types()
+    {
+        var index = new ObjectIndexFile
+        {
+            Objects =
+            [
+                new ObjectIndexEntry
+                {
+                    Type = "Katana", Entity = "item", Category = "Items.Weapons.Swords",
+                    Chunk = "items.weapons.swords", ItemID = 0x13FF, Hue = 0
+                }
+            ]
+        };
+
+        var root = CAGLoader.BuildTree(index);
+
+        var items = Assert.IsType<CAGCategory>(FindChild(root, "Items"));
+        var weapons = Assert.IsType<CAGCategory>(FindChild(items, "Weapons"));
+        var swords = Assert.IsType<CAGCategory>(FindChild(weapons, "Swords"));
+
+        var leaf = Assert.IsType<CAGObject>(swords.Nodes[0]);
+        Assert.Equal(typeof(Katana), leaf.Type);
+        Assert.Equal(0x13FF, leaf.ItemID);
+    }
+
+    [Fact]
+    public void BuildTree_keeps_multiple_objects_in_one_category()
+    {
+        var index = new ObjectIndexFile
+        {
+            Objects =
+            [
+                new ObjectIndexEntry { Type = "Katana",   Entity = "item", Category = "Items.Weapons.Swords", Chunk = "items.weapons.swords", ItemID = 0x13FF, Hue = 0 },
+                new ObjectIndexEntry { Type = "Longsword", Entity = "item", Category = "Items.Weapons.Swords", Chunk = "items.weapons.swords", ItemID = 0x0F5E, Hue = 0 }
+            ]
+        };
+
+        var root = CAGLoader.BuildTree(index);
+        var swords = (CAGCategory)FindNestedCategory(root, "Items", "Weapons", "Swords");
+
+        var leafTypes = swords.Nodes.OfType<CAGObject>().Select(o => o.Type).ToList();
+        Assert.Contains(typeof(Katana), leafTypes);
+        Assert.Contains(typeof(Server.Items.Longsword), leafTypes);
+    }
+
+    private static CAGNode FindChild(CAGCategory parent, string title)
+    {
+        foreach (var node in parent.Nodes)
+        {
+            if (node.Title == title)
+            {
+                return node;
+            }
+        }
+
+        throw new Xunit.Sdk.XunitException($"No child '{title}'.");
+    }
+
+    private static CAGNode FindNestedCategory(CAGCategory root, params string[] titles)
+    {
+        CAGNode current = root;
+        foreach (var title in titles)
+        {
+            current = FindChild((CAGCategory)current, title);
+        }
+
+        return current;
+    }
+}

Projects/UOContent.Tests/Tests/Commands/Objects/CategorizationSyncTests.cs

@@ -0,0 +1,44 @@
+using System.Collections.Generic;
+using System.Linq;
+using Server.Commands;
+using Server.Items;
+using Xunit;
+
+namespace UOContent.Tests.Commands.Objects;
+
+public class CategorizationSyncTests
+{
+    private static CAGJson Cat(string category, params System.Type[] types) =>
+        new()
+        {
+            Category = category,
+            Objects = types.Select(t => new CAGObject { Type = t }).ToArray()
+        };
+
+    [Fact]
+    public void Reconcile_appends_missing_types_to_uncategorized()
+    {
+        var categorization = new List<CAGJson> { Cat("Items.Weapons.Swords", typeof(Katana)) };
+        var discovered = new List<System.Type> { typeof(Katana), typeof(Runebook) };
+
+        var (updated, report) = CategorizationSync.Reconcile(categorization, discovered);
+
+        Assert.Contains("Runebook", report.Appended);
+        Assert.Empty(report.Orphaned);
+
+        var uncategorized = Assert.Single(updated, c => c.Category == "Items.Uncategorized");
+        Assert.Contains(uncategorized.Objects, o => o.Type == typeof(Runebook));
+    }
+
+    [Fact]
+    public void Reconcile_reports_orphans_not_in_discovered()
+    {
+        var categorization = new List<CAGJson> { Cat("Items.Weapons.Swords", typeof(Katana)) };
+        var discovered = new List<System.Type> { typeof(Runebook) };
+
+        var (_, report) = CategorizationSync.Reconcile(categorization, discovered);
+
+        Assert.Contains("Katana", report.Orphaned);
+        Assert.Contains("Runebook", report.Appended);
+    }
+}

Projects/UOContent.Tests/Tests/Commands/Objects/ObjectCacheBuilderTests.cs

@@ -0,0 +1,35 @@
+using System.Collections.Generic;
+using Server.Commands;
+using Server.Items;
+using Xunit;
+
+namespace UOContent.Tests.Commands.Objects;
+
+public class ObjectCacheBuilderTests
+{
+    [Fact]
+    public void Build_produces_index_row_and_detail_chunk()
+    {
+        var extracted = new ExtractedObject(
+            typeof(Runebook),
+            "item",
+            "Items.Skill Items.Magical",
+            new LeanMetadata(8901, 0x461, "runebook", 1041267),
+            [new CtorDoc()],
+            [new PropertyDoc { Name = "Hue", Type = "int" }],
+            [new OplLine { Cliloc = 1041267 }],
+            "Item"
+        );
+
+        var (index, chunks) = ObjectCacheBuilder.Build([extracted], "2026-07-19T00:00:00Z");
+
+        var row = Assert.Single(index.Objects);
+        Assert.Equal("Runebook", row.Type);
+        Assert.Equal("items.skill-items.magical", row.Chunk);
+        Assert.Equal(8901, row.ItemID);
+
+        var chunk = Assert.Contains("items.skill-items.magical", chunks);
+        Assert.Contains("Runebook", chunk.Keys);
+        Assert.Equal("Item", chunk["Runebook"].BaseType);
+    }
+}

Projects/UOContent.Tests/Tests/Commands/Objects/ObjectCacheGeneratorTests.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using Server.Commands;
+using Server.Items;
+using Xunit;
+
+namespace UOContent.Tests.Commands.Objects;
+
+[Collection("Sequential UOContent Tests")]
+public class ObjectCacheGeneratorTests
+{
+    [Fact]
+    public void Generate_builds_index_and_chunks_from_extracted_objects()
+    {
+        var discovered = new List<Type> { typeof(Runebook), typeof(Katana) };
+        var categorization = new List<CAGJson>(); // empty -> both land in Items.Uncategorized
+
+        var result = ObjectCacheGenerator.Generate(categorization, discovered);
+
+        Assert.Equal(2, result.Index.Objects.Count);
+        Assert.NotEmpty(result.Chunks);
+
+        var runebook = Assert.Single(result.Index.Objects, o => o.Type == "Runebook");
+        Assert.True(runebook.ItemID > 0);
+        Assert.Equal(1041267, runebook.Cliloc);
+        Assert.Equal("items.uncategorized", runebook.Chunk);
+
+        Assert.Contains("Runebook", result.Report.Appended);
+        Assert.Contains("items.uncategorized", result.Chunks.Keys);
+        Assert.Contains("Runebook", result.Chunks["items.uncategorized"].Keys);
+    }
+}

Projects/UOContent.Tests/Tests/Commands/Objects/ObjectDiscoveryTests.cs

@@ -0,0 +1,19 @@
+using Server.Commands;
+using Server.Items;
+using Xunit;
+
+namespace UOContent.Tests.Commands.Objects;
+
+[Collection("Sequential UOContent Tests")]
+public class ObjectDiscoveryTests
+{
+    [Fact]
+    public void Discover_includes_concrete_constructibles_and_excludes_abstract()
+    {
+        var types = ObjectIntrospection.DiscoverConstructibleTypes();
+
+        Assert.Contains(typeof(Katana), types);
+        Assert.Contains(typeof(Runebook), types);
+        Assert.DoesNotContain(typeof(BaseWeapon), types); // abstract
+    }
+}

Projects/UOContent.Tests/Tests/Commands/Objects/ObjectIndexSerializationTests.cs

@@ -0,0 +1,52 @@
+using System.IO;
+using Server.Commands;
+using Server.Json;
+using Xunit;
+
+namespace UOContent.Tests.Commands.Objects;
+
+public class ObjectIndexSerializationTests
+{
+    [Fact]
+    public void ObjectIndexFile_round_trips_through_json()
+    {
+        var index = new ObjectIndexFile
+        {
+            GeneratedUtc = "2026-07-19T00:00:00Z",
+            Objects =
+            [
+                new ObjectIndexEntry
+                {
+                    Type = "Katana",
+                    Entity = "item",
+                    Category = "Items.Weapons.Swords",
+                    Chunk = "items.weapons.swords",
+                    ItemID = 8901,
+                    Hue = 0x461,
+                    Name = "katana",
+                    Cliloc = 1041267
+                }
+            ]
+        };
+
+        var tempPath = Path.GetTempFileName();
+        try
+        {
+            JsonConfig.Serialize(tempPath, index);
+            var roundTripped = JsonConfig.Deserialize<ObjectIndexFile>(tempPath);
+
+            Assert.NotNull(roundTripped);
+            var entry = Assert.Single(roundTripped.Objects);
+
+            Assert.Equal("Katana", entry.Type);
+            Assert.Equal("items.weapons.swords", entry.Chunk);
+            Assert.Equal(8901, entry.ItemID);
+            Assert.Equal(0x461, entry.Hue);
+            Assert.Equal(1041267, entry.Cliloc);
+        }
+        finally
+        {
+            File.Delete(tempPath);
+        }
+    }
+}

Projects/UOContent.Tests/Tests/Commands/Objects/ObjectIntrospectionCtorsTests.cs

@@ -0,0 +1,23 @@
+using Server.Commands;
+using Server.Items;
+using Xunit;
+
+namespace UOContent.Tests.Commands.Objects;
+
+[Collection("Sequential UOContent Tests")]
+public class ObjectIntrospectionCtorsTests
+{
+    [Fact]
+    public void ExtractCtors_lists_both_constructible_runebook_overloads()
+    {
+        // Runebook has [Constructible] Runebook() and [Constructible] Runebook(int maxCharges).
+        var ctors = ObjectIntrospection.ExtractCtors(typeof(Runebook));
+
+        Assert.Equal(2, ctors.Count);
+        Assert.Contains(ctors, c => c.Parameters.Count == 0);
+
+        var parameterized = Assert.Single(ctors, c => c.Parameters.Count == 1);
+        Assert.Equal("maxCharges", parameterized.Parameters[0].Name);
+        Assert.Equal("int", parameterized.Parameters[0].Type);
+    }
+}

Projects/UOContent.Tests/Tests/Commands/Objects/ObjectIntrospectionLeanTests.cs

@@ -0,0 +1,31 @@
+using Server.Commands;
+using Server.Items;
+using Server.Tests;
+using Xunit;
+
+namespace UOContent.Tests.Commands.Objects;
+
+[Collection("Sequential UOContent Tests")]
+public class ObjectIntrospectionLeanTests
+{
+    [SkippableFact]
+    public void ExtractLean_reads_item_id_from_a_weapon()
+    {
+        // Requires client TileData: ExtractLean clamps itemID > TileData.MaxItemValue to 1, and
+        // MaxItemValue is 0 when tiledata.mul is absent (CI), so the real 0x13FF only survives with data.
+        TileDataRequirement.SkipIfMissing();
+
+        // Katana ctor is base(0x13FF) — era-independent.
+        var lean = ObjectIntrospection.ExtractLean(typeof(Katana));
+        Assert.Equal(0x13FF, lean.ItemID);
+    }
+
+    [Fact]
+    public void ExtractLean_reads_hue_and_cliloc_from_a_runebook()
+    {
+        // Runebook sets Hue = 0x461 and LabelNumber 1041267 regardless of era.
+        var lean = ObjectIntrospection.ExtractLean(typeof(Runebook));
+        Assert.Equal(0x461, lean.Hue);
+        Assert.Equal(1041267, lean.Cliloc);
+    }
+}

Projects/UOContent.Tests/Tests/Commands/Objects/ObjectIntrospectionOplTests.cs

@@ -0,0 +1,17 @@
+using Server.Commands;
+using Server.Items;
+using Xunit;
+
+namespace UOContent.Tests.Commands.Objects;
+
+[Collection("Sequential UOContent Tests")]
+public class ObjectIntrospectionOplTests
+{
+    [Fact]
+    public void ExtractOpl_captures_the_runebook_name_cliloc()
+    {
+        // Runebook.LabelNumber is 1041267 ("runebook") — it appears as an OPL line.
+        var opl = ObjectIntrospection.ExtractOpl(typeof(Runebook));
+        Assert.Contains(opl, line => line.Cliloc == 1041267);
+    }
+}

Projects/UOContent.Tests/Tests/Commands/Objects/ObjectIntrospectionPropertiesTests.cs

@@ -0,0 +1,22 @@
+using Server.Commands;
+using Server.Items;
+using Xunit;
+
+namespace UOContent.Tests.Commands.Objects;
+
+[Collection("Sequential UOContent Tests")]
+public class ObjectIntrospectionPropertiesTests
+{
+    [Fact]
+    public void ExtractProperties_includes_inherited_item_command_properties()
+    {
+        var props = ObjectIntrospection.ExtractProperties(typeof(Runebook));
+
+        var hue = Assert.Single(props, p => p.Name == "Hue");
+        Assert.Equal("int", hue.Type);
+
+        var lootType = Assert.Single(props, p => p.Name == "LootType");
+        Assert.NotNull(lootType.EnumValues);
+        Assert.Contains("Blessed", lootType.EnumValues);
+    }
+}

Projects/UOContent.Tests/Tests/Commands/Objects/ObjectNamingTests.cs

@@ -0,0 +1,29 @@
+using System;
+using Server.Commands;
+using Xunit;
+
+namespace UOContent.Tests.Commands.Objects;
+
+public class ObjectNamingTests
+{
+    [Theory]
+    [InlineData("Items.Skill Items.Magical", "items.skill-items.magical")]
+    [InlineData("Items.Weapons.Swords", "items.weapons.swords")]
+    [InlineData("Mobiles.Uncategorized", "mobiles.uncategorized")]
+    public void ChunkKey_lowercases_and_replaces_spaces(string category, string expected)
+    {
+        Assert.Equal(expected, ObjectNaming.ChunkKey(category));
+    }
+
+    [Theory]
+    [InlineData(typeof(int), "int")]
+    [InlineData(typeof(bool), "bool")]
+    [InlineData(typeof(string), "string")]
+    [InlineData(typeof(double), "double")]
+    [InlineData(typeof(int?), "int?")]
+    [InlineData(typeof(Server.Items.WeaponQuality), "WeaponQuality")]
+    public void FriendlyTypeName_maps_primitives_and_keeps_enum_names(Type t, string expected)
+    {
+        Assert.Equal(expected, ObjectNaming.FriendlyTypeName(t));
+    }
+}

Projects/UOContent.Tests/Tests/Engines/AdvancedSearch/AdvancedSearchPagingTests.cs

@@ -1,17 +0,0 @@
-using Server.Engines.AdvancedSearch;
-using Xunit;
-
-namespace UOContent.Tests;
-
-public class AdvancedSearchPagingTests
-{
-    [Theory]
-    [InlineData(20, 0, 18, 18)]  // full first page
-    [InlineData(20, 18, 18, 2)]  // partial last page -> 2 visible (bug rendered 0 in descending)
-    [InlineData(5, 0, 18, 5)]
-    [InlineData(0, 0, 18, 0)]
-    public void VisibleCount_IsCorrect(int total, int from, int max, int expected)
-    {
-        Assert.Equal(expected, AdvancedSearchGump.VisibleCount(total, from, max));
-    }
-}

Projects/UOContent.Tests/Tests/Engines/AdvancedSearch/AdvancedSearchTypesTests.cs

@@ -1,27 +0,0 @@
-using Server;
-using Server.Engines.AdvancedSearch;
-using Xunit;
-
-namespace UOContent.Tests;
-
-[Collection("Sequential UOContent Tests")]
-public class AdvancedSearchTypesTests
-{
-    [Fact]
-    public void CompareValues_Poison_ReferenceTypeParsedViaTypes()
-    {
-        PoisonKinds.Configure(); // idempotent; registers Lesser..Lethal now that Core.Expansion is set
-
-        // Poison is a reference type implementing ISpanParsable; it can't use the compile-time span
-        // path and routes through the shared Server.Types converter. Poison.Parse returns the
-        // registered singleton, so "= Lethal" is a reference-equality match — this is the case that
-        // previously compared a Poison against the raw string and always failed.
-        var prop = Poison.Lethal;
-        Assert.True(AdvancedSearchUtilities.CompareValues(typeof(Poison), prop, "Lethal", "="));
-        Assert.False(AdvancedSearchUtilities.CompareValues(typeof(Poison), prop, "Lesser", "="));
-
-        var ex = Record.Exception(() =>
-            Assert.False(AdvancedSearchUtilities.CompareValues(typeof(Poison), prop, "notapoison", "=")));
-        Assert.Null(ex);
-    }
-}

Projects/UOContent.Tests/Tests/Engines/AdvancedSearch/AdvancedSearchUtilitiesTests.cs

@@ -1,119 +0,0 @@
-using System;
-using Server;
-using Server.Engines.AdvancedSearch;
-using Xunit;
-
-namespace UOContent.Tests;
-
-public class AdvancedSearchUtilitiesTests
-{
-    [Theory]
-    [InlineData("abc")]           // not a number -> was FormatException
-    [InlineData("99999999999")]   // overflows int -> was OverflowException
-    [InlineData("0xZZ")]          // bad hex -> was FormatException
-    public void CompareValues_BadNumeric_ReturnsFalse_DoesNotThrow(string value)
-    {
-        var ex = Record.Exception(() =>
-        {
-            var result = AdvancedSearchUtilities.CompareValues(typeof(int), 5, value, ">");
-            Assert.False(result);
-        });
-        Assert.Null(ex);
-    }
-
-    [Theory]
-    [InlineData("Bogus")]         // not a member -> was ArgumentException
-    [InlineData("onehandedxyz")]  // not a member, even case-insensitively -> was ArgumentException
-    public void CompareValues_BadEnum_ReturnsFalse_DoesNotThrow(string value)
-    {
-        var ex = Record.Exception(() =>
-        {
-            var result = AdvancedSearchUtilities.CompareValues(typeof(Layer), (byte)Layer.OneHanded, value, "=");
-            Assert.False(result);
-        });
-        Assert.Null(ex);
-    }
-
-    [Fact]
-    public void CompareValues_ValidEnum_IgnoresCase()
-    {
-        Assert.True(AdvancedSearchUtilities.CompareValues(typeof(Layer), (byte)Layer.OneHanded, "onehanded", "="));
-    }
-
-    [Theory]
-    // leaf value is "T"/"F"; evalLeaf returns leaf=="T"
-    [InlineData("T", true)]
-    [InlineData("F", false)]
-    [InlineData("F@F|T", true)]   // (F&&F)||T = T   (buggy code gave F&&(F||T)=F)
-    [InlineData("T|F@F", true)]   // T||(F&&F) = T   (buggy code gave (T||F)&&F=F)
-    [InlineData("T@F", false)]
-    [InlineData("T@T", true)]
-    [InlineData("F|F", false)]
-    public void EvaluateBoolean_Precedence(string expr, bool expected)
-    {
-        // State is unused here; the leaf evaluator just checks the span equals "T".
-        var result = AdvancedSearchUtilities.EvaluateBoolean(expr, 0, static (_, leaf) => leaf.SequenceEqual("T"));
-        Assert.Equal(expected, result);
-    }
-
-    [Fact]
-    public void CompareValues_ReferenceType_EqualityByString_NoThrow()
-    {
-        // A reference-typed property (e.g. RootParent name-ish) compared with "=" should not throw,
-        // and ordering operators must return false rather than throwing.
-        var ex = Record.Exception(() =>
-        {
-            Assert.False(AdvancedSearchUtilities.CompareValues(typeof(object), new object(), "whatever", ">"));
-        });
-        Assert.Null(ex);
-    }
-
-    [Fact]
-    public void CompareValues_TimeSpan_ParsesViaSpanParsable()
-    {
-        // TimeSpan is not IConvertible, so the old Convert.ChangeType fallback threw and silently
-        // returned no-match. ISpanParsable<TimeSpan> parses it correctly.
-        var prop = TimeSpan.FromMinutes(5);
-        Assert.True(AdvancedSearchUtilities.CompareValues(typeof(TimeSpan), prop, "00:05:00", "="));
-        Assert.False(AdvancedSearchUtilities.CompareValues(typeof(TimeSpan), prop, "00:10:00", "="));
-        Assert.True(AdvancedSearchUtilities.CompareValues(typeof(TimeSpan), prop, "00:01:00", ">"));
-    }
-
-    [Fact]
-    public void CompareValues_TimeSpan_BadInput_ReturnsFalse_NoThrow()
-    {
-        var ex = Record.Exception(() =>
-            Assert.False(AdvancedSearchUtilities.CompareValues(typeof(TimeSpan), TimeSpan.Zero, "notaspan", "=")));
-        Assert.Null(ex);
-    }
-
-    [Fact]
-    public void CompareValues_Guid_ValueTypeParsedViaTypes()
-    {
-        // Guid is a value type not named by the hot paths; it's parsed via Types (IParsable) and
-        // compared by value.
-        var g = Guid.Parse("00000000-0000-0000-0000-000000000001");
-        Assert.True(AdvancedSearchUtilities.CompareValues(typeof(Guid), g, "00000000-0000-0000-0000-000000000001", "="));
-        Assert.False(AdvancedSearchUtilities.CompareValues(typeof(Guid), g, "00000000-0000-0000-0000-000000000002", "="));
-    }
-
-    // A reference type with a legacy RunUO-style static Parse(string) and NO IParsable<> interface —
-    // the Faction/Town shape. Types must still discover its Parse by reflection.
-    private sealed class LegacyParseType
-    {
-        public string Value { get; private init; }
-        public static LegacyParseType Parse(string s) => new() { Value = s };
-        public override bool Equals(object obj) => obj is LegacyParseType o && o.Value == Value;
-        public override int GetHashCode() => Value?.GetHashCode() ?? 0;
-    }
-
-    [Fact]
-    public void CompareValues_LegacyParseString_ParsedViaTypes()
-    {
-        // Pre-IParsable types (only a static Parse(string)) must still be searchable: Types binds the
-        // legacy Parse by reflection, so we compare against a real parsed instance, not the raw text.
-        var prop = LegacyParseType.Parse("alpha");
-        Assert.True(AdvancedSearchUtilities.CompareValues(typeof(LegacyParseType), prop, "alpha", "="));
-        Assert.False(AdvancedSearchUtilities.CompareValues(typeof(LegacyParseType), prop, "beta", "="));
-    }
-}

Projects/UOContent.Tests/Tests/Engines/AdvancedSearch/AdvancedSearchWorkerTests.cs

@@ -1,95 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using Server;
-using Server.Engines.AdvancedSearch;
-using Server.Items;
-using Server.Tests;
-using Xunit;
-
-namespace UOContent.Tests;
-
-[Collection("Sequential UOContent Tests")]
-public class AdvancedSearchWorkerTests
-{
-    // An item whose property test path will throw when evaluated.
-    private sealed class ThrowingItem : Item
-    {
-        public ThrowingItem() : base(0x1) { }
-        public ThrowingItem(Serial s) : base(s) { }
-        public string Boom => throw new InvalidOperationException("boom");
-    }
-
-    [Fact]
-    public void Worker_FilterThrows_DoesNotEscape_ReturnsNoMatch()
-    {
-        var worker = new AdvancedSearchThreadWorker();
-        var results = new ConcurrentQueue<AdvancedSearchResult>();
-        var ignore = new ConcurrentQueue<IEntity>();
-        var filter = new AdvancedSearchFilter
-        {
-            FilterPropertyTest = true,
-            PropertyTest = "Boom=1", // reflection GetValue -> throws
-        };
-
-        var item = new ThrowingItem();
-
-        try
-        {
-            worker.Wake(new WorldLocation(Point3D.Zero, Map.Felucca), filter, results, ignore);
-            worker.Push(item);
-            worker.Sleep(); // drains; must not crash the test process
-
-            Assert.Empty(results);
-        }
-        finally
-        {
-            item.Delete();
-            worker.Exit();
-        }
-    }
-
-    [Fact]
-    public void Worker_DeletedEntity_IsSkipped()
-    {
-        var worker = new AdvancedSearchThreadWorker();
-        var results = new ConcurrentQueue<AdvancedSearchResult>();
-        var ignore = new ConcurrentQueue<IEntity>();
-        var filter = new AdvancedSearchFilter(); // no filters -> everything matches
-
-        var item = new Item(0x1);
-        item.Delete();
-
-        try
-        {
-            worker.Wake(new WorldLocation(Point3D.Zero, Map.Felucca), filter, results, ignore);
-            worker.Push(item);
-            worker.Sleep();
-
-            Assert.Empty(results);
-        }
-        finally
-        {
-            worker.Exit();
-        }
-    }
-
-    [Fact]
-    public void DoSearch_IsGuarded_AgainstReentry()
-    {
-        // White-box: flip the guard, assert a second entry is rejected, then clear.
-        // _searchInProgress is process-global static state; release it in finally so a
-        // failed assert here can't leak the guard into other tests.
-        Assert.False(AdvancedSearchGump.IsSearchInProgress);
-        Assert.True(AdvancedSearchGump.TryBeginSearch()); // acquires
-        try
-        {
-            Assert.False(AdvancedSearchGump.TryBeginSearch()); // rejected
-        }
-        finally
-        {
-            AdvancedSearchGump.EndSearch(); // releases
-        }
-
-        Assert.False(AdvancedSearchGump.IsSearchInProgress);
-    }
-}

Projects/UOContent.Tests/Tests/Engines/Factions/FactionRankTests.cs

@@ -1,100 +0,0 @@
-using System.Collections.Generic;
-using Server;
-using Server.Factions;
-using Xunit;
-
-namespace UOContent.Tests;
-
-/// <summary>
-/// PlayerState.Rank is read from GetProperties, so it must stay a plain field read. These pin what
-/// that requires: the rank is never null, and it is correct without anyone having read it first.
-/// </summary>
-[Collection("Sequential UOContent Tests")]
-public class FactionRankTests
-{
-    // The faction ctor builds its own Definition, so no world state is needed.
-    private static Faction NewFaction() => new CouncilOfMages();
-
-    private static PlayerState AddMember(Faction faction, List<PlayerState> owner)
-    {
-        var state = new PlayerState(new Mobile(), faction, owner);
-        owner.Add(state);
-        return state;
-    }
-
-    [Fact]
-    public void Rank_IsPopulatedBeforeAnythingReadsIt()
-    {
-        var faction = NewFaction();
-        var state = new PlayerState(new Mobile(), faction, []);
-
-        // Nothing recomputes on read, so the ctor must leave a usable value or Rank.Title NREs.
-        Assert.NotNull(state.Rank);
-        Assert.NotNull(state.Rank.Title);
-    }
-
-    [Fact]
-    public void Rank_IsTheLowestRank_ForAnUnrankedMember()
-    {
-        var faction = NewFaction();
-        var owner = new List<PlayerState>();
-        var a = AddMember(faction, owner);
-        var b = AddMember(faction, owner);
-
-        a.UpdateRank();
-        b.UpdateRank();
-
-        var lowest = faction.Definition.Ranks[^1];
-
-        Assert.Equal(lowest.Rank, a.Rank.Rank);
-        Assert.Equal(lowest.Rank, b.Rank.Rank);
-    }
-
-    [Fact]
-    public void SettingRankIndex_UpdatesRankWithoutAnyoneReadingIt()
-    {
-        var faction = NewFaction();
-        var owner = new List<PlayerState>();
-        var top = AddMember(faction, owner);
-        var bottom = AddMember(faction, owner);
-
-        faction.ZeroRankOffset = 2;
-
-        top.RankIndex = 0;
-        bottom.RankIndex = 1;
-
-        // No read triggered these, yet the ordering is reflected.
-        Assert.True(top.Rank.Rank > bottom.Rank.Rank);
-    }
-
-    [Fact]
-    public void ReadingRank_IsStableAndSideEffectFree()
-    {
-        var faction = NewFaction();
-        var owner = new List<PlayerState>();
-        var state = AddMember(faction, owner);
-
-        faction.ZeroRankOffset = 1;
-        state.RankIndex = 0;
-
-        var first = state.Rank;
-        var second = state.Rank;
-
-        Assert.Same(first, second);
-    }
-
-    [Fact]
-    public void RankIndexOutOfSyncWithZeroRankOffset_StillResolvesARank()
-    {
-        var faction = NewFaction();
-        var owner = new List<PlayerState>();
-        var a = AddMember(faction, owner);
-        AddMember(faction, owner);
-
-        // A negative percent used to match no rank at all, leaving Rank null.
-        faction.ZeroRankOffset = 1;
-        a.RankIndex = 5;
-
-        Assert.NotNull(a.Rank);
-    }
-}

Projects/UOContent.Tests/Tests/Gumps/TestGumps/DynamicTestGump.cs

@@ -6,8 +6,6 @@ public class DynamicTestGump : DynamicGump
 {
     private readonly string _petName;
 
-    public bool HasVisualElementsForTest => HasVisualElements;
-
     public DynamicTestGump(string petName) : base(50, 50)
     {
         _petName = petName;

Projects/UOContent.Tests/Tests/Gumps/TestGumps/EmptyTestGumps.cs

@@ -1,40 +0,0 @@
-using Server.Gumps;
-
-namespace Server.Tests.Gumps;
-
-public sealed class EmptyLegacyTestGump : Gump
-{
-    public bool HasVisualElementsForTest => HasVisualElements;
-
-    public EmptyLegacyTestGump() : base(0, 0)
-    {
-    }
-}
-
-public sealed class EmptyDynamicTestGump : DynamicGump
-{
-    public bool HasVisualElementsForTest => HasVisualElements;
-
-    public EmptyDynamicTestGump() : base(0, 0)
-    {
-    }
-
-    protected override void BuildLayout(ref DynamicGumpBuilder builder)
-    {
-        builder.AddPage();
-    }
-}
-
-public sealed class EmptyStaticTestGump : StaticGump<EmptyStaticTestGump>
-{
-    public bool HasVisualElementsForTest => HasVisualElements;
-
-    public EmptyStaticTestGump() : base(0, 0)
-    {
-    }
-
-    protected override void BuildLayout(ref StaticGumpBuilder builder)
-    {
-        builder.SetNoClose();
-    }
-}

Projects/UOContent.Tests/Tests/Gumps/TestGumps/LegacyTestGump.cs

@@ -4,8 +4,6 @@ namespace Server.Tests.Gumps;
 
 public sealed class LegacyTestGump : Gump
 {
-    public bool HasVisualElementsForTest => HasVisualElements;
-
     public LegacyTestGump(string petName) : base(50, 50)
     {
         Serial = (Serial)0x123;

Projects/UOContent.Tests/Tests/Gumps/TestGumps/StaticTestGump.cs

@@ -4,8 +4,6 @@ namespace Server.Tests.Gumps;
 
 public class StaticTestGump : StaticGump<StaticTestGump>
 {
-    public bool HasVisualElementsForTest => HasVisualElements;
-
     public StaticTestGump() : base(50, 50)
     {
         Serial = (Serial)0x123;

Projects/UOContent.Tests/Tests/Gumps/TestLayoutGumps.cs

@@ -73,32 +73,6 @@ public class TestLayoutGumps
         AssertThat.Equal(writer.Span, packet);
     }
 
-    [Fact]
-    public void TestEmptyGumpsHaveNoVisualElements()
-    {
-        Assert.False(Compile(new EmptyLegacyTestGump()).HasVisualElementsForTest);
-        Assert.False(Compile(new EmptyDynamicTestGump()).HasVisualElementsForTest);
-        Assert.False(Compile(new EmptyStaticTestGump()).HasVisualElementsForTest);
-        Assert.False(Compile(new EmptyStaticTestGump()).HasVisualElementsForTest);
-    }
-
-    [Fact]
-    public void TestVisibleGumpsHaveVisualElements()
-    {
-        Assert.True(Compile(new LegacyTestGump("Test")).HasVisualElementsForTest);
-        Assert.True(Compile(new DynamicTestGump("Test")).HasVisualElementsForTest);
-        Assert.True(Compile(new StaticTestGump()).HasVisualElementsForTest);
-        Assert.True(Compile(new StaticTestGump()).HasVisualElementsForTest);
-    }
-
-    private static T Compile<T>(T gump) where T : BaseGump
-    {
-        var buffer = GC.AllocateUninitializedArray<byte>(512);
-        var writer = new SpanWriter(buffer);
-        gump.Compile(ref writer);
-        return gump;
-    }
-
     private static void InternalTestStaticGump<T>(ReadOnlySpan<byte> expectedLayout, StaticGump<T> staticGump, string[] strings)
         where T : StaticGump<T>
     {

Projects/UOContent.Tests/Tests/Items/TreasureChests/TreasureMapChestLiftTests.cs

@@ -1,111 +0,0 @@
-using Server;
-using Server.Items;
-using Server.Mobiles;
-using Server.Tests;
-using Xunit;
-
-namespace UOContent.Tests;
-
-[Collection("Sequential UOContent Tests")]
-public class TreasureMapChestLiftTests
-{
-    // Coordinates chosen to avoid overlap with Tracking (1000-4000, 1000-4000) and
-    // DetectHidden (1000-2400, 500) test areas.
-
-    [Fact]
-    public void PartialLift_MarksSplitRemainderAsLifted()
-    {
-        using var rng = new PredictableRandom(10); // RandomDouble() = 0.5, no spawn roll fires
-        var map = Map.Felucca;
-        var location = new Point3D(5000, 600, 0);
-        var player = CreatePlayerMobile(map, location);
-        var chest = new TreasureMapChest(1);
-
-        try
-        {
-            chest.MoveToWorld(location, map);
-            chest.Locked = false;
-
-            var gold = FindGold(chest, null);
-            Assert.NotNull(gold);
-
-            player.Lift(gold, 1, out var rejected, out _);
-            Assert.False(rejected);
-
-            // The stack split re-adds the remainder as a brand-new item. It must count as
-            // already lifted, otherwise every 1-coin pull grants a fresh guardian spawn roll.
-            var remainder = FindGold(chest, gold);
-            Assert.NotNull(remainder);
-            Assert.Contains(remainder, chest.Lifted);
-            Assert.Contains(gold, chest.Lifted);
-        }
-        finally
-        {
-            player.Holding?.Delete();
-            player.Delete();
-            chest.Delete();
-        }
-    }
-
-    [Fact]
-    public void ItemAddedAfterFill_IsMarkedLifted()
-    {
-        using var rng = new PredictableRandom(10);
-        var chest = new TreasureMapChest(1);
-        var packed = new Gold(500);
-
-        try
-        {
-            // Anything entering the chest after the initial fill (packed-back gold, split
-            // remainders, GM drops) was never part of the original loot and must not
-            // grant spawn rolls when lifted back out.
-            chest.DropItem(packed);
-
-            Assert.Contains(packed, chest.Lifted);
-        }
-        finally
-        {
-            chest.Delete();
-        }
-    }
-
-    [Fact]
-    public void OriginalFillLoot_IsNotMarkedLifted()
-    {
-        using var rng = new PredictableRandom(10);
-        var chest = new TreasureMapChest(1);
-
-        try
-        {
-            // The original loot must stay roll-eligible for its first lift.
-            Assert.True(chest.Lifted == null || chest.Lifted.Count == 0);
-        }
-        finally
-        {
-            chest.Delete();
-        }
-    }
-
-    private static Gold FindGold(TreasureMapChest chest, Gold except)
-    {
-        var items = chest.Items;
-
-        for (var i = 0; i < items.Count; i++)
-        {
-            if (items[i] is Gold gold && gold != except)
-            {
-                return gold;
-            }
-        }
-
-        return null;
-    }
-
-    private static PlayerMobile CreatePlayerMobile(Map map, Point3D location)
-    {
-        var mobile = new PlayerMobile(World.NewMobile);
-        mobile.DefaultMobileInit();
-        mobile.MoveToWorld(location, map);
-        return mobile;
-    }
-}

Projects/UOContent.Tests/Tests/Mobiles/AI/MoveSpeedTests.cs

@@ -1,219 +0,0 @@
-using System;
-using System.Collections.Generic;
-using Server;
-using Server.Mobiles;
-using Xunit;
-
-namespace UOContent.Tests.Mobiles.AI;
-
-// Pins the CurrentMoveSpeed classification (verbatim active/passive maps to the matching
-// move value; bespoke stays fused), SetSpeed's one-clock guarantee, and the v22 tail.
-[Collection("Sequential UOContent Tests")]
-public class MoveSpeedTests : IDisposable
-{
-    // Delete spawned stubs so they don't linger in the shared static World.
-    private readonly List<Mobile> _created = new();
-
-    public void Dispose()
-    {
-        for (var i = 0; i < _created.Count; i++)
-        {
-            _created[i].Delete();
-        }
-    }
-
-    private sealed class SpeedStub : BaseCreature
-    {
-        // Stands in for the npc-speeds table (unconfigured in the test fixture).
-        public double TableActiveMove;
-        public double TablePassiveMove;
-
-        public SpeedStub() : base(AIType.AI_Animal) => Body = 0xC9;
-
-        public SpeedStub(Serial serial) : base(serial) => Body = 0xC9;
-
-        public override void GetSpeeds(out double activeSpeed, out double passiveSpeed)
-        {
-            activeSpeed = 0.3;
-            passiveSpeed = 0.6;
-        }
-
-        public override void GetMoveSpeeds(out double activeMoveSpeed, out double passiveMoveSpeed)
-        {
-            activeMoveSpeed = TableActiveMove;
-            passiveMoveSpeed = TablePassiveMove;
-        }
-    }
-
-    private SpeedStub NewCreature()
-    {
-        var bc = new SpeedStub();
-        _created.Add(bc);
-        return bc;
-    }
-
-    [Fact]
-    public void MoveSpeeds_InheritThinkValues_ByDefault()
-    {
-        var bc = NewCreature();
-
-        Assert.Equal(0.3, bc.ActiveMoveSpeed);
-        Assert.Equal(0.6, bc.PassiveMoveSpeed);
-        Assert.Equal(bc.CurrentSpeed, bc.CurrentMoveSpeed);
-    }
-
-    [Fact]
-    public void CurrentMoveSpeed_ResolvesPerMode_WhenOverridden()
-    {
-        var bc = NewCreature();
-        bc.SetMoveSpeed(0.45, 0.9);
-
-        // SetSpeed left the creature passive; the think clock is untouched.
-        Assert.Equal(0.6, bc.CurrentSpeed);
-        Assert.Equal(0.9, bc.CurrentMoveSpeed);
-
-        bc.SetCurrentSpeedToActive();
-        Assert.Equal(0.3, bc.CurrentSpeed);
-        Assert.Equal(0.45, bc.CurrentMoveSpeed);
-    }
-
-    [Fact]
-    public void CurrentMoveSpeed_BespokePace_StaysFused()
-    {
-        var bc = NewCreature();
-        bc.SetMoveSpeed(0.45, 0.9);
-
-        // Neither think value verbatim, so both clocks run it.
-        bc.CurrentSpeed = 0.11;
-        Assert.Equal(0.11, bc.CurrentMoveSpeed);
-    }
-
-    [Fact]
-    public void SetSpeed_ClearsMoveOverrides()
-    {
-        var bc = NewCreature();
-        bc.SetMoveSpeed(0.45, 0.9);
-
-        bc.SetSpeed(0.2, 0.4);
-
-        Assert.Equal(0.2, bc.ActiveMoveSpeed);
-        Assert.Equal(0.4, bc.PassiveMoveSpeed);
-    }
-
-    [Fact]
-    public void NonPositiveMoveSpeed_ClearsThatOverride()
-    {
-        var bc = NewCreature();
-        bc.SetMoveSpeed(0.45, 0.9);
-
-        bc.ActiveMoveSpeed = 0;
-
-        Assert.Equal(0.3, bc.ActiveMoveSpeed);  // inheriting again
-        Assert.Equal(0.9, bc.PassiveMoveSpeed); // other override untouched
-    }
-
-    [Fact]
-    public void ScaleMoveSpeed_ScalesOverrides_LeavesInheritAlone()
-    {
-        var bc = NewCreature();
-        bc.ActiveMoveSpeed = 0.6; // passive left inheriting
-
-        bc.ScaleMoveSpeed(1.0 / 1.2);
-
-        Assert.Equal(0.5, bc.ActiveMoveSpeed);
-        Assert.Equal(bc.PassiveSpeed, bc.PassiveMoveSpeed); // still inheriting, not 0 * scalar
-    }
-
-    [Fact]
-    public void Herding_DrivesMoveClock_ThinkUntouched()
-    {
-        var bc = NewCreature(); // think 0.3/0.6, passive
-        bc.SetMoveSpeed(0.45, 1.05);
-
-        bc.TargetLocation = new Point2D(10, 10);
-
-        Assert.Equal(0.6, bc.CurrentSpeed);     // think clock unaffected by herding
-        Assert.Equal(0.3, bc.CurrentMoveSpeed); // fixed herding pace, not 1.05
-
-        bc.TargetLocation = null;
-        Assert.Equal(1.05, bc.CurrentMoveSpeed);
-    }
-
-    [Fact]
-    public void SnapSpeedsToTable_UndoesScalingDrift_KeepsTunedValues()
-    {
-        var bc = NewCreature();
-        bc.TableActiveMove = 0.45;
-        bc.TablePassiveMove = 0.9;
-        bc.SetMoveSpeed(0.45, 0.9);
-
-        // 0.45 and 0.9 do not survive /1.2 then *1.2 bit-exactly.
-        bc.ScaleMoveSpeed(1.0 / 1.2);
-        bc.ScaleMoveSpeed(1.2);
-        Assert.NotEqual(0.45, bc.ActiveMoveSpeed);
-
-        bc.SnapSpeedsToTable();
-        Assert.Equal(0.45, bc.ActiveMoveSpeed);
-        Assert.Equal(0.9, bc.PassiveMoveSpeed);
-
-        // A hand-tuned value is nowhere near the epsilon and must keep.
-        bc.SetMoveSpeed(0.7, 0.9);
-        bc.SnapSpeedsToTable();
-        Assert.Equal(0.7, bc.ActiveMoveSpeed);
-    }
-
-    [Fact]
-    public void Migration_MatchingThinkSpeeds_AdoptTableMoveValues()
-    {
-        var bc = NewCreature(); // think 0.3/0.6, matching its table entry
-        bc.TableActiveMove = 0.45;
-        bc.TablePassiveMove = 0.9;
-
-        bc.MigrateMoveSpeeds();
-
-        Assert.Equal(0.45, bc.ActiveMoveSpeed);
-        Assert.Equal(0.9, bc.PassiveMoveSpeed);
-    }
-
-    [Fact]
-    public void Migration_TunedThinkSpeeds_KeepInheriting()
-    {
-        var bc = NewCreature();
-        bc.SetSpeed(0.35, 0.6); // hand-tuned: no longer matches the table entry
-        bc.TableActiveMove = 0.45;
-        bc.TablePassiveMove = 0.9;
-
-        bc.MigrateMoveSpeeds();
-
-        Assert.Equal(0.35, bc.ActiveMoveSpeed);
-        Assert.Equal(0.6, bc.PassiveMoveSpeed);
-    }
-
-    [Theory]
-    [InlineData(true)]
-    [InlineData(false)]
-    public void MoveSpeedOverrides_SurviveSerialization(bool overridden)
-    {
-        var bc = NewCreature();
-        if (overridden)
-        {
-            bc.SetMoveSpeed(0.45, 0.9);
-        }
-
-        var writer = new BufferWriter(true);
-        bc.Serialize(writer);
-
-        var buffer = new byte[writer.Position];
-        writer.Buffer.AsSpan(0, (int)writer.Position).CopyTo(buffer);
-
-        var copy = new SpeedStub(World.NewMobile);
-        _created.Add(copy);
-        var reader = new BufferReader(buffer);
-        copy.Deserialize(reader);
-
-        // The v22 tail is the last block; exact consumption catches any offset mistake.
-        Assert.Equal(buffer.Length, reader.Position);
-        Assert.Equal(overridden ? 0.45 : 0.3, copy.ActiveMoveSpeed);
-        Assert.Equal(overridden ? 0.9 : 0.6, copy.PassiveMoveSpeed);
-    }
-}

Projects/UOContent.Tests/Tests/Multis/SpreadsheetTests.cs

@@ -1,114 +0,0 @@
-using System;
-using System.IO;
-using Server.Multis;
-using Xunit;
-
-namespace UOContent.Tests;
-
-public class SpreadsheetTests : IDisposable
-{
-    // misc.txt's shape: 13 columns, the last being the Comment the client never reads.
-    private const string Types = "int\tint\tint\tint\tint\tint\tint\tint\tint\tint\tint\tint\tstring";
-
-    private const string Names =
-        "Category\tStyle\tTID\tPiece1\tPiece2\tPiece3\tPiece4\tPiece5\tPiece6\tPiece7\tPiece8\tFeatureMask\tComment";
-
-    private readonly string _path = Path.Combine(Path.GetTempPath(), $"muo-sheet-{Guid.NewGuid():N}.txt");
-
-    public void Dispose()
-    {
-        if (File.Exists(_path))
-        {
-            File.Delete(_path);
-        }
-    }
-
-    private Spreadsheet Write(params string[] rows)
-    {
-        var lines = new string[rows.Length + 2];
-        lines[0] = Types;
-        lines[1] = Names;
-        rows.CopyTo(lines, 2);
-
-        File.WriteAllLines(_path, lines);
-        return new Spreadsheet(_path);
-    }
-
-    [Fact]
-    public void RowMissingTrailingCommentIsStillRead()
-    {
-        // An empty Comment written without a trailing tab leaves the row one field short.
-        var ss = Write("0\t0\t1060056\t44\t0\t41\t40\t42\t0\t43\t29\t8");
-
-        var record = Assert.Single(ss.Records);
-
-        Assert.Equal(44, record.GetInt32(ss.GetColumnID("Piece1")));
-        Assert.Equal(29, record.GetInt32(ss.GetColumnID("Piece8")));
-        Assert.Equal(8, record.GetInt32(ss.GetColumnID("FeatureMask")));
-    }
-
-    [Fact]
-    public void ShortRowDoesNotDropLaterRows()
-    {
-        var ss = Write(
-            "0\t0\t1060056\t44\t0\t41\t40\t42\t0\t43\t29\t0",
-            "0\t1\t1060057\t45\t0\t0\t0\t0\t0\t0\t0\t0\tFieldstone Arches"
-        );
-
-        Assert.Equal(2, ss.Records.Length);
-        Assert.Equal(44, ss.Records[0].GetInt32(ss.GetColumnID("Piece1")));
-        Assert.Equal(45, ss.Records[1].GetInt32(ss.GetColumnID("Piece1")));
-    }
-
-    [Fact]
-    public void TabOnlySeparatorLinesAreNotMistakenForHeaderRows()
-    {
-        // The retail client's doors.txt separates its header rows this way.
-        var separator = new string('\t', 12);
-
-        File.WriteAllLines(
-            _path,
-            [
-                Types,
-                separator,
-                Names,
-                separator,
-                "0\t0\t1060056\t44\t0\t41\t40\t42\t0\t43\t29\t0\tFieldstone Archways"
-            ]
-        );
-
-        var ss = new Spreadsheet(_path);
-
-        Assert.Equal(3, ss.GetColumnID("Piece1"));
-        Assert.Equal(11, ss.GetColumnID("FeatureMask"));
-
-        var record = Assert.Single(ss.Records);
-        Assert.Equal(44, record.GetInt32(ss.GetColumnID("Piece1")));
-    }
-
-    [Fact]
-    public void MissingHeaderRowsThrowsInsteadOfNullReference()
-    {
-        File.WriteAllLines(_path, [Types]);
-
-        Assert.Throws<InvalidDataException>(() => new Spreadsheet(_path));
-    }
-
-    [Fact]
-    public void HeaderWithFewerNamesThanTypesIsTolerated()
-    {
-        File.WriteAllLines(
-            _path,
-            [
-                Types,
-                "Category\tStyle\tTID\tPiece1",
-                "0\t0\t1060056\t44\t0\t41\t40\t42\t0\t43\t29\t0\tFieldstone Archways"
-            ]
-        );
-
-        var ss = new Spreadsheet(_path);
-
-        Assert.Equal(44, ss.Records[0].GetInt32(ss.GetColumnID("Piece1")));
-        Assert.Equal(-1, ss.GetColumnID("FeatureMask"));
-    }
-}

Projects/UOContent.Tests/Tests/Network/AutoDenylist/AutoDenylistTests.cs

@@ -1,206 +0,0 @@
-/*************************************************************************
- * ModernUO                                                              *
- * Copyright 2019-2026 - ModernUO Development Team                       *
- * Email: hi@modernuo.com                                                *
- * File: AutoDenylistTests.cs                                            *
- *                                                                       *
- * This program is free software: you can redistribute it and/or modify  *
- * it under the terms of the GNU General Public License as published by  *
- * the Free Software Foundation, either version 3 of the License, or     *
- * (at your option) any later version.                                   *
- *                                                                       *
- * You should have received a copy of the GNU General Public License     *
- * along with this program.  If not, see <http://www.gnu.org/licenses/>. *
- *************************************************************************/
-
-using System.Net;
-using Server.Network;
-using Server.Network.Bans;
-using Xunit;
-
-namespace Server.Tests.Network.AutoDenylists;
-
-// Static store, so every test resets it first and none may run alongside another.
-// Addresses come from TEST-NET-2 (198.51.100.0/24).
-[Collection("Sequential UOContent Tests")]
-public class AutoDenylistTests
-{
-    private const long DurationMs = 900_000; // 15 minutes, the shipped default
-    private const long Now = 1_000_000;
-
-    private static void Reset(bool enabled = true, int maxEntries = 1024) =>
-        AutoDenylist.LoadForTesting(enabled, DurationMs, maxEntries);
-
-    [Fact]
-    public void Behavioral_detection_is_held_then_lapses()
-    {
-        Reset();
-        var ip = IPAddress.Parse("198.51.100.10");
-
-        Assert.True(AutoDenylist.Hold(ip, BanReasons.InvalidSeed, Now));
-
-        Assert.True(AutoDenylist.IsDenied(ip, Now));
-        Assert.True(AutoDenylist.IsDenied(ip, Now + DurationMs - 1));
-
-        // Expiry is decided on read, so the hold lapses without waiting for a sweep.
-        Assert.False(AutoDenylist.IsDenied(ip, Now + DurationMs));
-    }
-
-    [Fact]
-    public void Manual_and_list_verdicts_are_not_held()
-    {
-        Reset();
-        var manual = IPAddress.Parse("198.51.100.11");
-        var listed = IPAddress.Parse("198.51.100.12");
-
-        // A manual ban belongs in the firewall; a blocklist match is enforced by the blocklist's own filter.
-        Assert.False(AutoDenylist.Hold(manual, BanReasons.Manual, Now));
-        Assert.False(AutoDenylist.Hold(listed, BanReasons.Blocklist, Now));
-
-        Assert.False(AutoDenylist.IsDenied(manual, Now));
-        Assert.False(AutoDenylist.IsDenied(listed, Now));
-        Assert.Equal(0, AutoDenylist.Count);
-    }
-
-    // Not refreshed on purpose: it is what keeps insertion order equal to expiry order, so retiring lapsed
-    // entries costs the number expiring instead of the number held. A flooder whose hold lapses trips the
-    // rate limiter on its next attempt -- which runs ahead of the connection filters -- and is held again.
-    [Fact]
-    public void Repeat_detection_does_not_extend_the_hold()
-    {
-        Reset();
-        var ip = IPAddress.Parse("198.51.100.13");
-
-        AutoDenylist.Hold(ip, BanReasons.SilentConnect, Now);
-        AutoDenylist.Hold(ip, BanReasons.SilentConnect, Now + DurationMs - 1);
-
-        Assert.Equal(1, AutoDenylist.Count); // no duplicate
-        Assert.True(AutoDenylist.IsDenied(ip, Now + DurationMs - 1));
-        Assert.False(AutoDenylist.IsDenied(ip, Now + DurationMs + 1)); // lapses from the FIRST detection
-    }
-
-    // The ring carries the expiry and the set carries membership; if they ever disagree, an address is
-    // either denied forever or retired early.
-    [Fact]
-    public void Ring_and_set_stay_in_step()
-    {
-        Reset(maxEntries: 4);
-
-        for (var i = 0; i < 8; i++)
-        {
-            AutoDenylist.Hold(IPAddress.Parse($"198.51.100.{70 + i}"), BanReasons.InvalidSeed, Now);
-        }
-
-        Assert.Equal(4, AutoDenylist.Count);
-        Assert.Equal(AutoDenylist.Count, AutoDenylist.RingCount);
-
-        AutoDenylist.Release(IPAddress.Parse("198.51.100.71"));
-        Assert.Equal(3, AutoDenylist.Count);
-        Assert.Equal(AutoDenylist.Count, AutoDenylist.RingCount);
-
-        AutoDenylist.Drain(Now + DurationMs + 1);
-        Assert.Equal(0, AutoDenylist.Count);
-        Assert.Equal(0, AutoDenylist.RingCount);
-    }
-
-    // The ring grows in doublings but is capped at maxEntries, which is not a power of two. Filling exactly
-    // to it must land on the last slot rather than off the end.
-    [Fact]
-    public void Ring_fills_exactly_to_a_non_power_of_two_cap()
-    {
-        Reset(maxEntries: 100);
-
-        for (var i = 0; i < 120; i++)
-        {
-            AutoDenylist.Hold(IPAddress.Parse($"198.51.100.{i}"), BanReasons.InvalidSeed, Now);
-        }
-
-        Assert.Equal(100, AutoDenylist.Count);
-        Assert.Equal(100, AutoDenylist.RingCount);
-
-        // And the whole ring still drains, so no slot was stranded by a wrapped write.
-        AutoDenylist.Drain(Now + DurationMs + 1);
-        Assert.Equal(0, AutoDenylist.Count);
-        Assert.Equal(0, AutoDenylist.RingCount);
-    }
-
-    // Releasing leaves no ring record behind, so a re-detection is not retired by the old one.
-    [Fact]
-    public void Release_then_re_hold_is_not_retired_by_the_stale_record()
-    {
-        Reset();
-        var ip = IPAddress.Parse("198.51.100.15");
-
-        AutoDenylist.Hold(ip, BanReasons.RateLimit, Now);
-        AutoDenylist.Release(ip);
-
-        var later = Now + DurationMs - 1;
-        AutoDenylist.Hold(ip, BanReasons.RateLimit, later);
-
-        // The first hold's expiry has passed; the second must survive it.
-        Assert.True(AutoDenylist.IsDenied(ip, Now + DurationMs + 1));
-        Assert.Equal(1, AutoDenylist.RingCount);
-    }
-
-    [Fact]
-    public void Release_drops_the_hold_immediately()
-    {
-        Reset();
-        var ip = IPAddress.Parse("198.51.100.14");
-
-        AutoDenylist.Hold(ip, BanReasons.RateLimit, Now);
-        AutoDenylist.Release(ip);
-
-        Assert.False(AutoDenylist.IsDenied(ip, Now));
-    }
-
-    [Fact]
-    public void Cap_is_enforced_so_a_distinct_source_flood_cannot_grow_it()
-    {
-        Reset(maxEntries: 4);
-
-        for (var i = 0; i < 10; i++)
-        {
-            AutoDenylist.Hold(IPAddress.Parse($"198.51.100.{100 + i}"), BanReasons.InvalidSeed, Now);
-        }
-
-        Assert.Equal(4, AutoDenylist.Count);
-
-        // The first four are still held; the rest were disconnected by their gate but not tracked.
-        Assert.True(AutoDenylist.IsDenied(IPAddress.Parse("198.51.100.100"), Now));
-        Assert.False(AutoDenylist.IsDenied(IPAddress.Parse("198.51.100.109"), Now));
-    }
-
-    [Fact]
-    public void Reaching_the_cap_reclaims_lapsed_entries_first()
-    {
-        Reset(maxEntries: 2);
-
-        AutoDenylist.Hold(IPAddress.Parse("198.51.100.20"), BanReasons.InvalidSeed, Now);
-        AutoDenylist.Hold(IPAddress.Parse("198.51.100.21"), BanReasons.InvalidSeed, Now);
-
-        // Once those two have lapsed, a new detection sweeps them out rather than being refused.
-        var later = Now + DurationMs + 1;
-        Assert.True(AutoDenylist.Hold(IPAddress.Parse("198.51.100.22"), BanReasons.InvalidSeed, later));
-        Assert.True(AutoDenylist.IsDenied(IPAddress.Parse("198.51.100.22"), later));
-    }
-
-    [Fact]
-    public void Disabled_store_denies_nobody()
-    {
-        Reset(enabled: false);
-        var ip = IPAddress.Parse("198.51.100.30");
-
-        Assert.False(AutoDenylist.Hold(ip, BanReasons.InvalidSeed, Now));
-        Assert.False(AutoDenylist.IsDenied(ip, Now));
-    }
-
-    [Fact]
-    public void Null_address_is_handled()
-    {
-        Reset();
-
-        Assert.False(AutoDenylist.Hold(null, BanReasons.InvalidSeed, Now));
-        Assert.False(AutoDenylist.IsDenied(null, Now));
-    }
-}