warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(saves): per-persistence entity type table hydrated at AddEntity

Browse source 
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
Kamron Batman 2026-07-16 11:54:41 -07:00
parent 1fb2c0a0d2
commit 4970e22541
No known key found for this signature in database
GPG key ID: 7D81DF26D9A5D94A
2 changed files with 80 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Projects/Server/Serialization/GenericEntityPersistence.cs
View file

@ -54,6 +54,35 @@ public class GenericEntityPersistence<T> : GenericPersistence, IGenericEntityPer
private readonly Dictionary<Serial, T> _pendingAdd = new();
private readonly Dictionary<Serial, T> _pendingDelete = new();
// Insertion-ordered table of every entity type added since boot. idx v4 records
// reference types by table index, so entries are never removed — a type whose
// entities were all deleted keeps its slot until restart. Only mutated on the game
// thread (AddEntity, deserialize); only read on the background writer thread during
// WritingSave, when AddEntity diverts to the pending queues.
private readonly Dictionary<Type, ushort> _typeIndexes = new();
private readonly List<Type> _typeTable = [];
internal IReadOnlyList<Type> TypeTable => _typeTable;
internal bool TryGetTypeIndex(Type type, out ushort index) => _typeIndexes.TryGetValue(type, out index);
internal void RegisterType(Type type)
{
ref var index = ref CollectionsMarshal.GetValueRefOrAddDefault(_typeIndexes, type, out var exists);
if (!exists)
{
if (_typeTable.Count > ushort.MaxValue)
{
throw new InvalidOperationException(
$"{Name} exceeded {ushort.MaxValue + 1} distinct entity types."
);
}
index = (ushort)_typeTable.Count;
_typeTable.Add(type);
}
}
public Dictionary<Serial, T> EntitiesBySerial { get; } = new();
public GenericEntityPersistence(string name, int priority, uint minSerial, uint maxSerial) : this(
@ -715,6 +744,7 @@ public class GenericEntityPersistence<T> : GenericPersistence, IGenericEntityPer
case WorldState.PendingSave:
case WorldState.Running:
{
RegisterType(entity.GetType());
ref var entityEntry = ref CollectionsMarshal.GetValueRefOrAddDefault(EntitiesBySerial, entity.Serial, out var exists);
if (exists)
{