SVSim/SVSimServer
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor(engine-ambient): ViewerId/RealTimeNetworkAgent/BattleRecoveryInfo read ambient first

Browse Source 
Step 4 of multi-instancing migration. Three additional per-battle statics
front-fronted by BattleAmbient.Current, each with a static fallback for
unwrapped callers. ViewerId's SavedataManager-persisting setter is preserved
on the fallback path; inside a scope, the setter is a no-op (the per-battle
perspective is fixed at scope entry).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
gamer147
2026-06-07 21:37:58 -04:00
parent 4e756a6c46
commit fe146fde50
9 changed files with 230 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
SVSim.BattleEngine/Patches/Data.ambient-recoveryinfo.patch Normal file
View File

@@ -0,0 +1,34 @@
Multi-instancing migration (Step 4): convert Wizard.Data.BattleRecoveryInfo — the per-battle
mid-game recovery snapshot (replay/reconnect/late-join state, owned by RecoveryDataHandler /
RecoveryNetworkManagerBase / RecoveryController) — to resolve through BattleAmbient.Current
when a scope is active, falling back to a `_battleRecoveryInfoFallback` static when not.
The original was a plain auto-property `{ get; set; }`; converting to a manual property +
ambient-aware getter/setter preserves the public read/write surface byte-identical
(design 2026-06-07-engine-multi-instancing, Task 4).
This is the only of the three Step-4 conversions whose setter we DO route through ambient
(unlike ViewerId, where the in-scope setter is a no-op): recovery info is mutated during the
battle (new snapshots overwrite old ones as recovery checkpoints stream in), so scoped writes
must land on the AsyncLocal slot, not bleed into the process-wide fallback.
The existing line-348 reset inside `Data.Clear()` (`BattleRecoveryInfo = null;`) keeps working
unchanged because it goes through the public setter, which now correctly routes to whichever
slot the caller's scope (or lack thereof) points at.
In-file references (1 declaration; ~5 setter/getter call sites elsewhere in the file go through
the public property and need no edits) handled as follows:
- line 179 auto-property → manual ambient-first getter + ambient-routed setter
--- Engine/Wizard/Data.cs (~line 179)
- public static BattleRecoveryInfo BattleRecoveryInfo { get; set; }
+ private static BattleRecoveryInfo _battleRecoveryInfoFallback;
+ public static BattleRecoveryInfo BattleRecoveryInfo
+ {
+ get => SVSim.BattleEngine.Ambient.BattleAmbient.Current?.RecoveryInfo ?? _battleRecoveryInfoFallback;
+ set
+ {
+ var c = SVSim.BattleEngine.Ambient.BattleAmbient.Current;
+ if (c != null) c.RecoveryInfo = value;
+ else _battleRecoveryInfoFallback = value;
+ }
+ }