fix(opl): refuse property list invalidation raised from inside GetProperties (#2555)

## The bug

Any property getter reached from `GetProperties` that calls `InvalidateProperties` takes the tooltip build down with it:

```
System.ArgumentNullException: Value cannot be null. (Parameter 'array')
   at Server.ObjectPropertyList.AppendStringDirect(String value)
   at Server.Mobiles.PlayerMobile.GetProperties(IPropertyList list)
```

`InvalidateProperties` rebuilds **in place** — `Reset()`, then `GetProperties()` again on the same instance — and `Reset()` does two destructive things to a build already in flight:

1. **It returns the pooled interpolation buffer.** The compiler rents it in the handler ctor and returns it in the closing `Add`, so *every hole is evaluated while it is live*:

```csharp
var handler = new InterpolatedStringHandler(1, 2, list); // InitializeInterpolation() RENTS
handler.AppendFormatted(pl.Rank.Title);                  // <-- getter runs HERE
handler.AppendLiteral("\t");
handler.AppendFormatted(faction.Definition.PropName);
list.Add(1060776, ref handler);                          // consumes span, RETURNS
```

```
GetProperties(list)
├─ InitializeInterpolation()  -> _arrayToReturnToPool = Rent(256)     buffer LIVE
├─ « hole 1: pl.Rank.Title »
│  └─ PlayerState.Rank.get   (lazy recompute)
│     └─ Invalidate() -> InvalidateProperties() -> m_PropertyList.Reset()
│        └─ Dispose(): Return(buf); _arrayToReturnToPool = null        buffer GONE
└─ handler.AppendFormatted("Knight")
   └─ _arrayToReturnToPool.AsSpan(_pos..)
      └─ ArgumentNullException (Parameter 'array')
```

It surfaces as `ArgumentNullException` rather than `NullReferenceException` because the `Range` overload of `AsSpan` must read `array.Length`, so the BCL null-checks and names the parameter `array`.

2. **It rewinds the packet cursor**, so properties already written are overwritten by the nested pass — a silently corrupted tooltip even where the buffer survives.

## The fix: refuse, don't recover

There is no correct recovery, and retrying the build would only hide the defect. A nested invalidation now logs an error with a stack trace, **throws in `DEBUG`** so it gets found and fixed, and in `RELEASE` returns without touching the list — a possibly stale tooltip, but no crash, no corrupted packet, and nothing leaked back to the pool. Getters that genuinely must invalidate should defer:

```csharp
Timer.DelayCall(InvalidateProperties);
```

The guard flag lives on the `ObjectPropertyList`, not the entity: it is that list's own lifecycle, it costs nothing (both `Item` and `ObjectPropertyList` absorb it in existing padding, and the list is allocated lazily), and it stays correct when builds for different entities nest.

Base instance sizes are unchanged from `main`: Item 128 B, Mobile 792 B, ObjectPropertyList 72 B, PlayerMobile 1216 B.

`PropertyList` also publishes the list into `m_PropertyList` **before** building it rather than assigning through `??=` afterwards, so a nested `InvalidateProperties` sees the build in progress instead of recursing into a second throwaway list whose work is discarded.

`ObjectPropertyList` re-rents its scratch buffer instead of spanning a null array, so a stray `Reset()` from any other caller degrades rather than aborting `GetProperties`.

## Factions `PlayerState`: maintained, not lazily computed

The getter that surfaced this is now a plain field read — the whole `if (m_InvalidateRank)` block and the flag itself are gone:

```csharp
public RankDefinition Rank => m_Rank;
```

`UpdateRank()` recomputes at each point an input actually changes:

| Site | Why |
|---|---|
| `RankIndex` setter | this player's index changed |
| end of `KillPoints` setter | two paths write `m_RankIndex` directly, bypassing the setter; runs once the swap bookkeeping and `ZeroRankOffset` have settled |
| `Faction.AddMember` | *after* the insert — the member count is not settled during the ctor |
| `FactionState` load | once ordering and `ZeroRankOffset` are final |

Supporting fixes this forced out:

- **Both ctors seed the lowest rank.** Nothing recomputes on read any more, so `Rank` has to be usable immediately — including for members that never get a `RankIndex` assigned, which is *every member with no kill points*. Without this, `Rank.Title` NREs.
- **`Rank` always resolves.** Ranks are ordered by `Required` descending ending at `0`, so a *negative* percent (`RankIndex` out of sync with `ZeroRankOffset`) matched nothing and left `m_Rank` null. It no longer divides by a zero `ZeroRankOffset` either.
- **A pre-existing staleness bug.** The `KillPoints` setter writes `m_RankIndex` directly in two places, so the cached rank was never refreshed when a player crossed zero kill points.

All six readers of `Rank` were checked; none relied on the old side effect.

One behaviour change worth flagging: rank refreshes are now **eager** where they used to be lazy, so a `KillPoints` change invalidates each swapped player as it happens. The swap loops break as soon as ordering is satisfied — typically 0–2 swaps — but it is on the path that runs on every faction kill.

## Documentation

The rule is written down so it is enforceable rather than folklore:

- **CLAUDE.md** audit rule 19
- **`dev-docs/property-lists.md`** — new "Never Invalidate From Inside `GetProperties`" section with the failing/passing pattern
- **`dev-docs/claude-skills/modernuo-property-lists.md`** — key rule + anti-pattern
- **`dev-docs/claude-skills/modernuo-code-audit.md`** — rule 19, ERROR severity

## Tests

- `ObjectPropertyListReentrancyTests` — `Reset()` and `Dispose()` re-entered mid-hole (both red against `main` with the exact exception above), nesting behaviour, and the new contract: `DEBUG` throws, `RELEASE` survives, and the build is never retried into a loop.
- `FactionRankTests` — `Rank` is populated before anything reads it, tracks `RankIndex` without a read, is stable across reads, and still resolves when `RankIndex` is out of sync with `ZeroRankOffset`. Red-verified: removing the ctor seed fails the first one.

793/793 `Server.Tests` and 608/608 `UOContent.Tests` pass.

## Noted, not addressed here

`~ObjectPropertyList()` returns the rented array to `STArrayPool<char>.Shared` from the **finalizer thread**, and that pool is single-threaded by design. Left alone as a separate concern.

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

@@ -0,0 +1,142 @@
+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>
+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>
+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/Items/Item.cs

@@ -14,6 +14,7 @@
  *************************************************************************/
 
 using System;
+using System.Diagnostics;
 using System.Collections.Generic;
 using System.Reflection;
 using System.Runtime.CompilerServices;
@@ -798,7 +799,22 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
 
     public virtual int HuedItemID => m_ItemID;
 
-    public ObjectPropertyList PropertyList => m_PropertyList ??= InitializePropertyList(new ObjectPropertyList(this));
+    public ObjectPropertyList PropertyList
+    {
+        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
@@ -2429,9 +2445,19 @@ public partial class Item : IHued, IComparable<Item>, ISpawnable, IObjectPropert
 
     private ObjectPropertyList InitializePropertyList(ObjectPropertyList list)
     {
-        GetProperties(list);
-        AppendChildProperties(list);
-        list.Terminate();
+        list.IsBuilding = true;
+
+        try
+        {
+            GetProperties(list);
+            AppendChildProperties(list);
+            list.Terminate();
+        }
+        finally
+        {
+            list.IsBuilding = false;
+        }
+
         return list;
     }
 
@@ -2448,6 +2474,26 @@ 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;

Projects/Server/Mobiles/Mobile.cs

@@ -26,6 +26,7 @@ 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;
@@ -2291,7 +2292,22 @@ 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 => m_PropertyList ??= InitializePropertyList(new ObjectPropertyList(this));
+    public ObjectPropertyList PropertyList
+    {
+        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)
     {
@@ -7225,8 +7241,18 @@ public partial class Mobile : IHued, IComparable<Mobile>, ISpawnable, IObjectPro
 
     private ObjectPropertyList InitializePropertyList(ObjectPropertyList list)
     {
-        GetProperties(list);
-        list.Terminate();
+        list.IsBuilding = true;
+
+        try
+        {
+            GetProperties(list);
+            list.Terminate();
+        }
+        finally
+        {
+            list.IsBuilding = false;
+        }
+
         return list;
     }
 
@@ -7243,6 +7269,26 @@ 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;

Projects/Server/PropertyList/ObjectPropertyList.cs

@@ -55,6 +55,12 @@ 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;
@@ -319,8 +325,23 @@ 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();
@@ -354,6 +375,8 @@ public sealed class ObjectPropertyList : IPropertyList, IDisposable
 
     public void AppendFormatted<T>(T value)
     {
+        EnsureInterpolationBuffer();
+
         string? s;
         if (value is IFormattable)
         {
@@ -384,6 +407,8 @@ public sealed class ObjectPropertyList : IPropertyList, IDisposable
 
     public void AppendFormatted<T>(T value, string? format)
     {
+        EnsureInterpolationBuffer();
+
         // '#' marks an integer argument as a cliloc ("#<value>"). Integers only -- a float/double/decimal
         // '#' 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)
@@ -442,6 +467,8 @@ public sealed class ObjectPropertyList : IPropertyList, IDisposable
 
     public void AppendFormatted(ReadOnlySpan<char> value)
     {
+        EnsureInterpolationBuffer();
+
         if (value.TryCopyTo(_arrayToReturnToPool.AsSpan(_pos..)))
         {
             _pos += value.Length;
@@ -454,6 +481,8 @@ 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)
         {
@@ -488,6 +517,8 @@ public sealed class ObjectPropertyList : IPropertyList, IDisposable
 
     public void AppendFormatted(string? value)
     {
+        EnsureInterpolationBuffer();
+
         if (value?.TryCopyTo(_arrayToReturnToPool.AsSpan(_pos..)) == true)
         {
             _pos += value.Length;

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

@@ -0,0 +1,100 @@
+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/Engines/Factions/Core/Faction.cs

@@ -242,7 +242,11 @@ public abstract class Faction : IComparable<Faction>, ISpanParsable<Faction>
 
     public virtual void AddMember(Mobile mob)
     {
-        Members.Insert(ZeroRankOffset, new PlayerState(mob, this, Members));
+        var state = new PlayerState(mob, this, Members);
+        Members.Insert(ZeroRankOffset, state);
+
+        // Ranked after the insert: the ctor ran while Owner was still short a member.
+        state.UpdateRank();
 
         mob.AddToBackpack(FactionItem.Imbue(new Robe(), this, false, Definition.HuePrimary));
         mob.SendLocalizedMessage(1010374); // You have been granted a robe which signifies your faction

Projects/UOContent/Engines/Factions/Core/FactionState.cs

@@ -114,6 +114,13 @@ public class FactionState
                         }
                     }
 
+                    // The loop above only assigns RankIndex to members with kill points, and nothing
+                    // computes rank on read, so rank everyone now that the ordering has settled.
+                    foreach (var player in Members)
+                    {
+                        player.UpdateRank();
+                    }
+
                     FactionItems = [];
 
                     if (version >= 2)

Projects/UOContent/Engines/Factions/Core/PlayerState.cs

@@ -8,7 +8,6 @@ public class PlayerState : IComparable<PlayerState>
 {
     private Town m_Finance;
 
-    private bool m_InvalidateRank = true;
     private int m_KillPoints;
     private MerchantTitle m_MerchantTitle;
     private RankDefinition m_Rank;
@@ -22,6 +21,10 @@ public class PlayerState : IComparable<PlayerState>
         Faction = faction;
         Owner = owner;
 
+        // Owner does not contain this state yet, so the count is short by one; the caller ranks it
+        // after inserting.
+        SeedLowestRank();
+
         Attach();
         Invalidate();
     }
@@ -54,6 +57,9 @@ public class PlayerState : IComparable<PlayerState>
                 }
         }
 
+        // Members are still being read; FactionState ranks everyone once the ordering settles.
+        SeedLowestRank();
+
         Attach();
     }
 
@@ -116,6 +122,8 @@ public class PlayerState : IComparable<PlayerState>
                         Owner.Remove(this);
                         Owner.Insert(Faction.ZeroRankOffset, this);
 
+                        // Direct, not through RankIndex: ZeroRankOffset is mid-update. The
+                        // UpdateRank() at the end of this setter covers it.
                         m_RankIndex = Faction.ZeroRankOffset;
                         Faction.ZeroRankOffset++;
                     }
@@ -180,6 +188,7 @@ public class PlayerState : IComparable<PlayerState>
                 }
 
                 m_KillPoints = value;
+                UpdateRank();
                 Invalidate();
             }
         }
@@ -193,49 +202,72 @@ public class PlayerState : IComparable<PlayerState>
             if (m_RankIndex != value)
             {
                 m_RankIndex = value;
-                m_InvalidateRank = true;
+
+                UpdateRank();
+                Invalidate();
             }
         }
     }
 
-    public RankDefinition Rank
+    /// <summary>
+    /// Read from PlayerMobile.GetProperties, so it must stay a plain field read -- recomputing or
+    /// invalidating here re-enters the property list build. Maintained by <see cref="UpdateRank"/>.
+    /// </summary>
+    public RankDefinition Rank => m_Rank;
+
+    // Lowest rank (Required 0): correct for an unranked member, and never null, so Rank.Title
+    // cannot NRE before the first UpdateRank().
+    private void SeedLowestRank()
     {
-        get
+        var ranks = Faction.Definition.Ranks;
+
+        if (ranks.Length > 0)
         {
-            if (m_InvalidateRank)
+            m_Rank = ranks[^1];
+        }
+    }
+
+    /// <summary>
+    /// Recomputes the cached rank. Call whenever <see cref="RankIndex"/>, the faction's
+    /// ZeroRankOffset, or the member count changes -- and only once they have settled.
+    /// </summary>
+    public void UpdateRank()
+    {
+        var ranks = Faction.Definition.Ranks;
+
+        if (ranks.Length == 0)
+        {
+            return;
+        }
+
+        int percent;
+
+        if (Owner.Count == 1)
+        {
+            percent = 1000;
+        }
+        else if (m_RankIndex == -1 || Faction.ZeroRankOffset <= 0)
+        {
+            percent = 0;
+        }
+        else
+        {
+            percent = (Faction.ZeroRankOffset - m_RankIndex) * 1000 / Faction.ZeroRankOffset;
+        }
+
+        // Ranks run Required-descending ending at 0, so anything >= 0 matches below. A negative
+        // percent (RankIndex out of sync with ZeroRankOffset) would otherwise leave it null.
+        m_Rank = ranks[^1];
+
+        for (var i = 0; i < ranks.Length; i++)
+        {
+            var check = ranks[i];
+
+            if (percent >= check.Required)
             {
-                var ranks = Faction.Definition.Ranks;
-                int percent;
-
-                if (Owner.Count == 1)
-                {
-                    percent = 1000;
-                }
-                else if (m_RankIndex == -1)
-                {
-                    percent = 0;
-                }
-                else
-                {
-                    percent = (Faction.ZeroRankOffset - m_RankIndex) * 1000 / Faction.ZeroRankOffset;
-                }
-
-                for (var i = 0; i < ranks.Length; i++)
-                {
-                    var check = ranks[i];
-
-                    if (percent >= check.Required)
-                    {
-                        m_Rank = check;
-                        m_InvalidateRank = false;
-                        break;
-                    }
-                }
-
-                Invalidate();
+                m_Rank = check;
+                break;
             }
-
-            return m_Rank;
         }
     }