## Summary
Moves spawner entry storage out of the abstract `BaseSpawner` into the concrete owner, so a spawner subclass can store its own entry type while every stock code path keeps working. Motivation: an out-of-tree spawner (ModernSpawner) needs `ModernSpawnerEntry : SpawnerEntry` with extra fields; today `BaseSpawner` owns `List<SpawnerEntry>` and a family of non-virtual members, and the serialization generator constructs list elements from the declared element type, so storage has to live in the class that declares the concrete list.
### What changed
- **`BaseSpawner` v13** no longer owns `_entries`. It reads entries through an abstract view and mutates them through an owner contract (`BaseSpawner.Entries.cs`):
`Entries` (`IReadOnlyList<SpawnerEntry>`, `[IgnoreDupe]`), `EntrySpan` (`ReadOnlySpan<SpawnerEntry>` for hot loops), `CreateEntry`, `AddEntryCore`, `RemoveEntryCore`, `ClearEntriesCore`, `AdoptEntries`, `CloneEntry`, `TransferSpawned`, plus public `RemoveAllEntries()`, `CopyEntriesTo(target)` and protected `RebuildSpawned()`. Every loop inside `BaseSpawner` is an indexed `for` over `EntrySpan`.
- **`Spawner` v2** owns `[SerializedIgnoreDupe] List<SpawnerEntry> _entryList` (generated `EntryList`, protected). `ProximitySpawner`/`RegionSpawner` inherit it unchanged. The `Spawned` rebuild and timer re-arm moved from the base `[AfterDeserialization]` (which runs before derived fields are read) into `Spawner`'s.
- **Save migration**: `MigrateFrom(V12Content)` (and the v10/v11/legacy readers) hand the old list to the owner via `AdoptEntries`; `Spawner.MigrateFrom(V1Content)` restores its own fields and leaves the adopted list alone. Three v12/v1/v0 save blobs captured before the change are committed as fixtures and loaded by tests.
- **Lifecycle hooks** (`BaseSpawner.Hooks.cs`, all no-op by default): `OnStarted`, `OnStopped`, `OnBeforeSpawn(entry)` veto, `OnConfigureSpawned(entry, spawned)` before positioning, entry-aware `GetSpawnPosition(entry, spawned, map)`, `OnSpawned(entry, spawned)`, `OnSpawnedDeath(entry, spawned, killer)`. `BaseCreature.OnDeath` calls `NotifySpawnedDeath` before base death (which deletes the mobile and unlinks the spawner). `Start()` and the `NextSpawn` setter share one start core so `OnStarted` fires on both.
- **`SpawnerEntry` v2**: per-entry `Disabled` (XmlSpawner's entry "lock"), stored inverted so the common case writes nothing in binary or JSON; skipped by weighted selection, live spawns untouched; toggle button per row in `SpawnerGump`. `SetParent` is public and `Parent` is protected so an out-of-tree entry subclass can adopt and dirty-track.
- **DTO**: `SpawnerDto` loses `Entries`; each concrete record declares its own `entries` at the same JSON order, so `Distribution/Data/Spawns/**` is byte-identical. Import adopts the deserialized entry objects instead of recreating them through `AddEntry`, which is what preserves subtype fields (and `disabled`).
### Breaking changes and behaviour changes
- **API:** `BaseSpawner.Entries` is `IReadOnlyList<SpawnerEntry>` instead of `List<SpawnerEntry>`. The generated `AddToEntries`/`RemoveFromEntries`/`InsertIntoEntries`/`RemoveFromEntriesAt`/`ClearEntries` helpers on `BaseSpawner` are gone; use `AddEntry`/`RemoveEntry`/`RemoveAllEntries`/`CopyEntriesTo`. `RemoveAllEntries()` deletes the entries' live spawns as well as the entries (the old generated `ClearEntries()` only cleared the list), which is why it has a new name rather than the old one.
- `SpawnerControllerGump` "copy entries" now goes through `CopyEntriesTo`, which deletes the target's live spawns (previously it cleared the list and left the spawns orphaned) and is a no-op when source == target (previously that wiped the source).
- `RemoveEntry` with an entry the spawner does not own is now a no-op (previously it deleted that entry's spawns).
- `Respawn()` honours `Disabled` because it calls `Spawn()`; `Spawn(int index)`, `RemoveSpawn`, and `RemoveSpawns` ignore it.
- Copying entries between spawners no longer forces a 1-second first spawn; the target re-arms on its normal delay.
- Subclasses that own a different entry list than `Spawner`'s must call `RebuildSpawned()` from their own `[AfterDeserialization]` (`Spawner`'s call runs before their list is read) and, when converting adopted entries into their own type, carry live spawns across with `TransferSpawned`. The in-repo test subclass demonstrates both.
### Performance
Manual harness (`Benchmark_SpawnPath_Manual`, skipped by default): 100k calls, entries all full so `Spawn()` does selection only.
| Path | Before (4bad0cc9e) | After |
|---|---|---|
| `Spawn()` 1 entry | 48.7 ns | 53.2 ns (within run-to-run noise) |
| `Spawn()` 10 entries | 243.7 ns | 153.1 ns |
| `Spawn()` 50 entries | 1077.6 ns | 645.1 ns |
| `Remove()` 10 entries | 139.6 ns | 83.6 ns |
Hooks are no-ops for stock spawners; `OnMovement` is untouched.
### Tests
- `SpawnerEntryOwnershipTests` (add/remove/clear, start after stop, dupe, copy, self-copy, foreign-entry removal, Disabled binary/JSON)
- `SpawnerHookTests` (hook order for mobiles and items, veto, death notification, `NextSpawn` start, a subclass with its own `List<TestEntry>` round-tripping and duping)
- `SpawnerSaveMigrationTests` (v12 fixtures through `Spawner`, `ProximitySpawner`, `RegionSpawner`; new-format byte-identical round trip with a live spawn reference)
- `SpawnerDtoEntryTests` (compact JSON position of `entries`, `disabled` only when set, import adopts the deserialized objects)
- Existing DTO/JSON/spawn-data tests unchanged. UOContent.Tests 801 passed, Server.Tests 869 passed. Migration schemas regenerated (`BaseSpawner.v13`, `Spawner.v2`, `SpawnerEntry.v2`).
Coverage caveats, stated plainly: v10, v11 and the pre-codegen legacy reader could not be captured as fixtures by the current code; each changed only `_entries = …` → `AdoptEntries(…)` into the same sink the v12 fixtures exercise, and is covered by review. The captured v12 fixtures carry no live spawns, so re-linking live `ISpawnable` references is proven by the new-format round trip, not by a legacy blob. The `SpawnerGump` toggle layout could not be checked in a client; the delete button moved from x=38 to x=46 to make room.
124 lines
4.2 KiB
C#
124 lines
4.2 KiB
C#
using System.Collections.Generic;
|
|
using Server.Items;
|
|
|
|
namespace Server.Engines.Spawners;
|
|
|
|
public abstract partial class BaseSpawner
|
|
{
|
|
// Static dictionary to track pending HomeRange migrations from v10
|
|
// Keyed by spawner instance, stores the HomeRange value to convert to SpawnBounds
|
|
private static readonly Dictionary<BaseSpawner, int> _pendingHomeRangeMigrations = new();
|
|
|
|
private void MigrateFrom(V10Content content)
|
|
{
|
|
_guid = content.Guid;
|
|
_returnOnDeactivate = content.ReturnOnDeactivate;
|
|
AdoptEntries(content.Entries ?? []);
|
|
_walkingRange = content.WalkingRange;
|
|
_wayPoint = content.WayPoint;
|
|
_group = content.Group;
|
|
_minDelay = content.MinDelay;
|
|
_maxDelay = content.MaxDelay;
|
|
_count = content.Count;
|
|
_team = content.Team;
|
|
_running = content.Running;
|
|
_end = _running ? content.End : Core.Now;
|
|
|
|
// Defer SpawnBounds calculation to AfterDeserialization when Location is available
|
|
if (content.HomeRange > 0)
|
|
{
|
|
_pendingHomeRangeMigrations[this] = content.HomeRange;
|
|
}
|
|
|
|
_spawnLocationIsHome = false;
|
|
|
|
// New v12 fields default to automatic/default
|
|
_spawnPositionMode = SpawnPositionMode.Automatic;
|
|
_maxSpawnAttempts = DefaultMaxSpawnAttempts;
|
|
}
|
|
|
|
private void MigrateFrom(V11Content content)
|
|
{
|
|
_guid = content.Guid;
|
|
_returnOnDeactivate = content.ReturnOnDeactivate;
|
|
AdoptEntries(content.Entries ?? []);
|
|
_walkingRange = content.WalkingRange;
|
|
_wayPoint = content.WayPoint;
|
|
_group = content.Group;
|
|
_minDelay = content.MinDelay;
|
|
_maxDelay = content.MaxDelay;
|
|
_count = content.Count;
|
|
_team = content.Team;
|
|
|
|
// Moved to Spawner
|
|
if (this is Spawner spawner)
|
|
{
|
|
spawner.SpawnBounds = content.SpawnBounds;
|
|
}
|
|
|
|
_running = content.Running;
|
|
_spawnLocationIsHome = content.SpawnLocationIsHome;
|
|
_end = _running ? content.End : Core.Now;
|
|
|
|
// New v12 fields default to automatic/default
|
|
_spawnPositionMode = SpawnPositionMode.Automatic;
|
|
_maxSpawnAttempts = DefaultMaxSpawnAttempts;
|
|
}
|
|
|
|
private void MigrateFrom(V12Content content)
|
|
{
|
|
_guid = content.Guid;
|
|
_returnOnDeactivate = content.ReturnOnDeactivate;
|
|
_walkingRange = content.WalkingRange;
|
|
_wayPoint = content.WayPoint;
|
|
_group = content.Group;
|
|
_minDelay = content.MinDelay ?? DefaultMinDelay;
|
|
_maxDelay = content.MaxDelay ?? DefaultMaxDelay;
|
|
_count = content.Count;
|
|
_team = content.Team ?? 0;
|
|
_running = content.Running;
|
|
_spawnLocationIsHome = content.SpawnLocationIsHome;
|
|
// End is unsaved when default; a running spawner re-arms immediately either way (DoTimer clamps).
|
|
_end = _running ? content.End ?? Core.Now : Core.Now;
|
|
_spawnPositionMode = content.SpawnPositionMode ?? SpawnPositionMode.Automatic;
|
|
_maxSpawnAttempts = content.MaxSpawnAttempts ?? DefaultMaxSpawnAttempts;
|
|
|
|
AdoptEntries(content.Entries ?? []);
|
|
}
|
|
|
|
private void Deserialize(IGenericReader reader, int version)
|
|
{
|
|
_guid = reader.ReadGuid();
|
|
_returnOnDeactivate = reader.ReadBool();
|
|
|
|
var count = reader.ReadInt();
|
|
var entries = new List<SpawnerEntry>(count);
|
|
|
|
for (var i = 0; i < count; ++i)
|
|
{
|
|
var entry = new SpawnerEntry(this);
|
|
entry.Deserialize(reader);
|
|
entries.Add(entry);
|
|
}
|
|
|
|
AdoptEntries(entries);
|
|
|
|
_walkingRange = reader.ReadInt();
|
|
_wayPoint = reader.ReadEntity<WayPoint>();
|
|
_group = reader.ReadBool();
|
|
_minDelay = reader.ReadTimeSpan();
|
|
_maxDelay = reader.ReadTimeSpan();
|
|
_count = reader.ReadInt();
|
|
_team = reader.ReadInt();
|
|
|
|
// Store homeRange for migration in AfterDeserialization when Location is available
|
|
var homeRange = reader.ReadInt();
|
|
if (homeRange > 0)
|
|
{
|
|
_pendingHomeRangeMigrations[this] = homeRange;
|
|
}
|
|
|
|
_running = reader.ReadBool();
|
|
_end = _running ? reader.ReadDeltaTime() : Core.Now;
|
|
}
|
|
}
|