Replace the shadow-property (Approach A) JSON mechanism with plain DTO records
so malformed files fail as GC-only and never leak live world Items.
Changes:
- Add Json/SpawnerDto.cs: abstract SpawnerDto + SpawnerDataDto / RegionSpawnerDto /
ProximitySpawnerDto, each [JsonDiscoverableType("<name>")] with ToSpawner()
- Add BaseSpawner.Dto.cs: internal ApplyDto(SpawnerDto) + private-protected Dto*
export helpers (DtoGuid, DtoMinDelay, etc.)
- Add Spawner.Dto.cs, RegionSpawner.Dto.cs, ProximitySpawner.Dto.cs: ToDto() overrides
- Add public abstract SpawnerDto ToDto() to BaseSpawner
- Retarget SpawnerJsonSerializer: discovery filter BaseSpawner→SpawnerDto; polymorphism
gate typeof(SpawnerDto); remove PruneToJsonProperties + AddOnDeserialized modifiers
- Delete BaseSpawner.Json.cs, Spawner.Json.cs, RegionSpawner.Json.cs,
ProximitySpawner.Json.cs (Approach A shadow-property partials)
- Remove [JsonDiscoverableType] + [JsonConstructor] from Spawner/RegionSpawner/ProximitySpawner
- Rewire ExportSpawnersCommand: build List<SpawnerDto> via spawner.ToDto()
- Rewire ImportSpawnersCommand: Deserialize<List<SpawnerDto>> then dto.ToSpawner();
map-null check now fires before ToSpawner(), so no orphan Items on bad map
- Delete 3 Approach-A round-trip tests; add SpawnerDtoRoundTripTests (4 cases)
- Update ExportImportFileTests + LegacyHomeRangeTests to use DTO path
- Add Import_MalformedFile_LeaksNoWorldItems to ImportCleanupTests
Build: dotnet build ModernUO.slnx → 0 errors, 0 warnings
Tests: dotnet test UOContent.Tests → 478/478 pass
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
91 lines
2.5 KiB
C#
91 lines
2.5 KiB
C#
using System;
|
|
using System.Text.Json;
|
|
using ModernUO.Serialization;
|
|
using Server.Json;
|
|
|
|
namespace Server.Engines.Spawners;
|
|
|
|
[SerializationGenerator(1)]
|
|
public partial class Spawner : BaseSpawner
|
|
{
|
|
/// <summary>
|
|
/// When true, enables proactive spiral scanning to find valid spawn positions.
|
|
/// Only relevant when SpawnPositionMode is Automatic or Enabled.
|
|
/// </summary>
|
|
[SerializableFieldSaveFlag(0)]
|
|
private bool ShouldSerializeUseSpiralScan() => _useSpiralScan;
|
|
|
|
[SerializableField(0)]
|
|
[SerializedCommandProperty(AccessLevel.Developer)]
|
|
private bool _useSpiralScan;
|
|
|
|
[SerializableFieldSaveFlag(1)]
|
|
private bool ShouldSerializeSpawnBounds() => _spawnBounds != default;
|
|
|
|
[SerializableProperty(1)]
|
|
[CommandProperty(AccessLevel.Developer)]
|
|
public override Rectangle3D SpawnBounds
|
|
{
|
|
get => _spawnBounds;
|
|
set
|
|
{
|
|
_spawnBounds = value;
|
|
InvalidateProperties();
|
|
this.MarkDirty();
|
|
}
|
|
}
|
|
|
|
[Constructible(AccessLevel.Developer)]
|
|
public Spawner()
|
|
{
|
|
}
|
|
|
|
[Constructible(AccessLevel.Developer)]
|
|
public Spawner(string spawnedName) : base(spawnedName)
|
|
{
|
|
}
|
|
|
|
[Constructible(AccessLevel.Developer)]
|
|
public Spawner(
|
|
int amount,
|
|
TimeSpan minDelay,
|
|
TimeSpan maxDelay,
|
|
int team = 0,
|
|
Rectangle3D spawnBounds = default,
|
|
params ReadOnlySpan<string> spawnedNames
|
|
) : base(amount, minDelay, maxDelay, team, spawnBounds, spawnedNames)
|
|
{
|
|
}
|
|
|
|
public Spawner(DynamicJson json, JsonSerializerOptions options) : base(json, options)
|
|
{
|
|
// Read spawnBounds (not in BaseSpawner to allow RegionSpawner to skip it)
|
|
if (json.GetProperty("spawnBounds", options, out Rectangle3D spawnBounds))
|
|
{
|
|
SpawnBounds = spawnBounds;
|
|
}
|
|
}
|
|
|
|
public override void ToJson(DynamicJson json, JsonSerializerOptions options)
|
|
{
|
|
base.ToJson(json, options);
|
|
|
|
if (SpawnBounds != default)
|
|
{
|
|
json.SetProperty("spawnBounds", options, SpawnBounds);
|
|
}
|
|
}
|
|
|
|
public override Region Region => Region.Find(Location, Map);
|
|
|
|
protected override bool SupportsSpiralScan => _useSpiralScan;
|
|
|
|
protected override Rectangle3D GetBoundsForSpawnAttempt() => SpawnBounds;
|
|
|
|
protected override ReadOnlySpan<Rectangle3D> GetAllSpawnBounds() => new(ref _spawnBounds);
|
|
|
|
private void MigrateFrom(V0Content content)
|
|
{
|
|
// V0 had no fields in Spawner, new v1 field _useSpiralScan defaults to false
|
|
}
|
|
}
|