fix: Fixes dirty-tracking gaps in generated content: setters, sub-object owners, BaseVendor (#2609)
## Why Delta world saves re-serialize an entity only when it has been marked dirty. An audit of the generated classes found three ways serialized state changes without a mark; this PR closes the ones that do not need a new generator package. ## What - **Custom `[SerializableProperty]` setters mark dirty.** Twelve hand-written setters assigned their backing field without `this.MarkDirty()`. `PlagueBeastLord.OpenedBy` was an auto-property carrying the attribute with no backing field at all; it is now a generated field with the same name, order and command-property exposure. - **Generated sub-objects are linked to their owner.** Without a `[DirtyTrackingEntity]` member the generator emits setters that mark nothing. Eight entity-owned sub-objects now carry the link and receive the owner through the constructor the generator calls: `BOBFilter` (owner is `IEntity`: a `PlayerMobile` or a `BulkOrderBook`), `BOBLargeSubEntry`, `PuzzleChestSolution` and `PuzzleChestSolutionAndTime`, `TalismanAttribute` (the random factories now take the talisman), `VendorItem`, `PlayerBBMessage`, `RaffleEntry`, `ShardPollOption`. Migration schemas were regenerated with the pinned tool; the only change is the value rule argument becoming `DeserializationRequiresParent`. - **BaseVendor uses the generator; restock amounts are no longer persisted.** The only state it wrote was which buy entries had grown restock amounts, packed by index into the live `SBInfos` tables. Restock is transient now and rebuilds on load; version 1 records are read and discarded through the legacy path. Every vendor subclass now serializes through a generated chain. ## Generator 4.1.0 This PR adopts SerializationGenerator 4.1.0 (modernuo/SerializationGenerator#55): SG3019/SG3020 diagnostics, `[VolatileSerializedState]`, `StopXxx()` timer helpers, and owner-constructor preference for sub-objects (so dictionary values are constructed with their owner; the 4.0.0 relink fallback is gone). `PlayerVendor.v3.json` gains `DeserializationRequiresParent` for its `VendorItem` values so the migration content struct constructs them with their vendor. SG3019 is an error under `TreatWarningsAsErrors` and generator diagnostics ignore pragmas, so the five contexts that live in whole-file player-keyed persistences (`ChampionTitle`, `ChampionTitleContext`, `MurderContext`, `VirtueContext`, `JailRecord`) now carry a `[DirtyTrackingEntity]` link to their `PlayerMobile`, which is where they will live once those blobs move onto the player record. `JailSystem.EmptyRecord` keeps a null player (`[CanBeNull]`). `ChampionTitle` needs both a context and a player constructor because the generator resolves the rule against the containing type but emits the call with the parent field; a comment in the file records this. ## Wire format Unchanged. No version bumps except `BaseVendor` 1 to 2 (which now writes nothing of its own). Schema diffs are rule-argument only (`DeserializationRequiresParent`). ## Testing Server.Tests 848 passed, UOContent.Tests 759 passed.
This commit is contained in:
parent
a2c232f4a8
commit
84153fba58
49 changed files with 223 additions and 214 deletions
|
|
@ -738,7 +738,7 @@ namespace Server
|
|||
{
|
||||
var talisman = new BaseTalisman(BaseTalisman.GetRandomItemID());
|
||||
|
||||
talisman.Summoner = BaseTalisman.GetRandomSummoner();
|
||||
talisman.Summoner = BaseTalisman.GetRandomSummoner(talisman);
|
||||
|
||||
if (talisman.Summoner.IsEmpty)
|
||||
{
|
||||
|
|
@ -758,8 +758,8 @@ namespace Server
|
|||
|
||||
talisman.Blessed = BaseTalisman.GetRandomBlessed();
|
||||
talisman.Slayer = BaseTalisman.GetRandomSlayer();
|
||||
talisman.Protection = BaseTalisman.GetRandomProtection();
|
||||
talisman.Killer = BaseTalisman.GetRandomKiller();
|
||||
talisman.Protection = BaseTalisman.GetRandomProtection(talisman);
|
||||
talisman.Killer = BaseTalisman.GetRandomKiller(talisman);
|
||||
talisman.Skill = BaseTalisman.GetRandomSkill();
|
||||
talisman.ExceptionalBonus = BaseTalisman.GetRandomExceptional();
|
||||
talisman.SuccessBonus = BaseTalisman.GetRandomSuccessful();
|
||||
|
|
|
|||
|
|
@ -187,7 +187,7 @@ public partial class ShardPoller : Item
|
|||
|
||||
for (var i = 0; i < _options.Length; ++i)
|
||||
{
|
||||
var option = _options[i] = new ShardPollOption();
|
||||
var option = _options[i] = new ShardPollOption(this);
|
||||
option.Deserialize(reader);
|
||||
}
|
||||
}
|
||||
|
|
@ -212,15 +212,23 @@ public partial class ShardPoller : Item
|
|||
[SerializationGenerator(1, false)]
|
||||
public partial class ShardPollOption
|
||||
{
|
||||
[DirtyTrackingEntity]
|
||||
private ShardPoller _poller;
|
||||
|
||||
private int _lineBreaks = -1;
|
||||
|
||||
[SerializableField(1)]
|
||||
private IPAddress[] _voters;
|
||||
|
||||
public ShardPollOption() => _voters = [];
|
||||
|
||||
public ShardPollOption(string title)
|
||||
public ShardPollOption(ShardPoller poller)
|
||||
{
|
||||
_poller = poller;
|
||||
_voters = [];
|
||||
}
|
||||
|
||||
public ShardPollOption(ShardPoller poller, string title)
|
||||
{
|
||||
_poller = poller;
|
||||
_title = title;
|
||||
_voters = [];
|
||||
}
|
||||
|
|
@ -600,7 +608,7 @@ public partial class ShardPollPrompt : Prompt
|
|||
|
||||
if (_option == null)
|
||||
{
|
||||
_poller.AddOption(new ShardPollOption(text));
|
||||
_poller.AddOption(new ShardPollOption(_poller, text));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue