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

Delete the persisted-behaviors feature per operator ruling

Browse source 
Operator ruling (docs/item-provenance-cut.md Progress header, 2026-09-17):
delete EntityPack.PersistedBehaviors, IPersistentBehavior,
PersistentBehaviorData and MarkerPersistentBehaviorData outright rather than
keep patching around a feature with no production writer. Key(5) is retired
and left unused; other MessagePack keys are untouched.

Removes the pack/unpack code that read and wrote the field, the feature-only
test ReopenedPackKeepsPersistedBehaviors and its BarePack initializer, and the
matching "not yet reached" mutation notes in tests/mutation_tests.py.
ReopenSurvivesAGeneratedShipWithEntities is kept: it pins the reopen defect
class against a real generated ship, independent of this feature.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Meta Vens 2026-09-17 05:44:37 +02:00
commit 8fe09a2303
5 changed files with 4 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Assets/Scripts/ServerShared/EntitySerializer.cs
View file

@ -29,18 +29,6 @@ public static class EntitySerializer
pack.Settings = entity.Settings;
// Filter item behavior collections by those with any persistent behaviors
// For each item create a (position, data) pair holding every one of its behaviors' persistent data.
// A dictionary keyed by int2 has no hash-resistant comparer under CultCache's untrusted-data security, so
// this is an array of pairs, matching Equipment/CargoBays/DockingBays.
pack.PersistedBehaviors = entity.Equipment
.Where(item => item.Behaviors.Any(b=>b is IPersistentBehavior))
.Select(item => (item.Position, item.Behaviors
.Where(b=>b is IPersistentBehavior)
.Cast<IPersistentBehavior>()
.Select(b => b.Store()).ToArray()))
.ToArray();
pack.Hull = entity.Hull;
pack.Name = entity.Name;
pack.Faction = entity.Faction == null ? default : entity.ItemManager.ItemData.RefOf(entity.Faction);
@ -122,18 +110,6 @@ public static class EntitySerializer
foreach (var (position, item) in pack.DockingBayContents[bayIndex])
entity.DockingBays[bayIndex].TryStore(item, position);
// Iterate only over the behaviors of items which contain persistent data
// Build a local lookup from the pairs array, then filter each item's behaviors for the persistent ones,
// cast them and combine with that item's persisted data array.
var persistedBehaviorsByPosition = pack.PersistedBehaviors.ToDictionary(x => x.position, x => x.data);
foreach (var persistentBehaviorData in entity.Equipment
.Where(item => persistedBehaviorsByPosition.ContainsKey(item.Position))
.SelectMany(item => item.Behaviors
.Where(b=> b is IPersistentBehavior)
.Cast<IPersistentBehavior>()
.Zip(persistedBehaviorsByPosition[item.Position], (behavior, data) => new{behavior, data})))
persistentBehaviorData.behavior.Restore(persistentBehaviorData.data);
entity.Temperature = pack.Temperature;
entity.Armor = pack.Armor;
@ -201,7 +177,7 @@ public abstract class EntityPack
[Key(2)] public (int2 position, EquippableItem item)[] Equipment;
[Key(3)] public (int2 position, EquippableItem item)[] CargoBays;
[Key(4)] public (int2 position, EquippableItem item)[] DockingBays;
[Key(5)] public (int2 position, PersistentBehaviorData[] data)[] PersistedBehaviors;
// Key(5) retired 2026-09-17; a deleted field used it. Do not reuse.
[Key(6)] public float[,] Temperature;
[Key(7)] public float[,] Armor;
[Key(8)] public bool2[,] Conductivity;