GameCult/Aetheria
Watch
9
0
Fork
You've already forked Aetheria
 0
Code Issues Pull requests 3 Projects Releases Packages Wiki Activity Actions

Fix F1: PersistedBehaviors as a pairs array, per Cut 0's ruling

Browse source 
Dictionary<int2, PersistentBehaviorData[]> has no hash-resistant comparer
under CultCache's UntrustedData security, so any run store holding an
entity threw MessagePackSerializationException on reopen, even when the
dictionary was empty. EntityPack.PersistedBehaviors (key 5, unchanged)
becomes (int2 position, PersistentBehaviorData[] data)[], matching
Equipment/CargoBays/DockingBays. Pack writes pairs; Unpack builds a local
lookup before restoring behaviors.

PersistentBehaviorData had no concrete leaf and no Union, so nothing could
ever exercise its wire format; added MarkerPersistentBehaviorData as the
one placeholder leaf so ReopenedPackKeepsPersistedBehaviors can round-trip
real data ahead of a real IPersistentBehavior implementer landing.

Tests: RunSaveTests.BarePack uses an empty pairs array.
Added ReopenedPackKeepsPersistedBehaviors (a hand-built pack with two
positions, each with one persisted behavior, round-trips through commit
and reopen) and ReopenSurvivesAGeneratedShipWithEntities (a real ship from
LoadoutGenerator against a catalog fixture, committed into a SavedZone and
reopened, pinning the defect at the layer Soul's probe found it).
MaterializedLotsSurviveSaveAndReload and CommitKeepsOnlyReachableLots go
green; 36 of 36 tests pass.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Meta Vens 2026-09-17 04:58:15 +02:00
commit e4df73e4fe
3 changed files with 140 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Assets/Scripts/ServerShared/Behaviors/Behaviors.cs
View file

@ -141,11 +141,21 @@ public interface IPopulationAssignment
}
[MessagePackObject,
JsonObject(MemberSerialization.OptIn)]
JsonObject(MemberSerialization.OptIn),
Union(0, typeof(MarkerPersistentBehaviorData))]
public abstract class PersistentBehaviorData
{
}
// No IBehavior implements IPersistentBehavior yet, so this abstract type has no production writer. This one
// concrete leaf exists so the wire format (EntitySerializer's PersistedBehaviors pairs array) can be exercised by
// tests ahead of a real persistent behavior landing.
[MessagePackObject]
public class MarkerPersistentBehaviorData : PersistentBehaviorData
{
[Key(0)] public int Value;
}
[Inspectable,
Union(0, typeof(GuidedWeaponData)),
Union(1, typeof(LauncherData)),