diff --git a/Server/src/SOR.Game/Handlers/GameHandlerBase.cs b/Server/src/SOR.Game/Handlers/GameHandlerBase.cs index 0e3070a..8adee43 100644 --- a/Server/src/SOR.Game/Handlers/GameHandlerBase.cs +++ b/Server/src/SOR.Game/Handlers/GameHandlerBase.cs @@ -17,6 +17,8 @@ using SOR.Shared.Networking; /// internal abstract class GameHandlerBase { + private static readonly JsonSerializerOptions AbilityJsonOptions = AbilitySystem.CreateJsonOptions(); + /// /// Load and validate an active game session for the calling player, /// acquiring a row-level lock (SELECT FOR UPDATE) inside an explicit @@ -266,11 +268,11 @@ internal abstract class GameHandlerBase if (state.PendingTriggeredTarget is { } pending) { var firstClientPickAction = JsonSerializer - .Deserialize(pending.ActionsJson) + .Deserialize(pending.ActionsJson, AbilityJsonOptions) ?.FirstOrDefault(AbilitySystem.ActionNeedsClientTargets_Public); var actionJson = firstClientPickAction is not null - ? JsonSerializer.Serialize(firstClientPickAction) + ? JsonSerializer.Serialize(firstClientPickAction, AbilityJsonOptions) : pending.ActionsJson; var targetPlayer = string.IsNullOrEmpty(pending.ChooserActorId)