diff --git a/Server/src/SOR.Game/Abilities/EffectPolymorphicConverter.cs b/Server/src/SOR.Game/Abilities/EffectPolymorphicConverter.cs index 11c5f73..3a605ee 100644 --- a/Server/src/SOR.Game/Abilities/EffectPolymorphicConverter.cs +++ b/Server/src/SOR.Game/Abilities/EffectPolymorphicConverter.cs @@ -33,8 +33,10 @@ internal abstract class PolymorphicAbilityConverter : JsonConverter where foreach (var attr in typeof(T).GetCustomAttributes()) { - s_typeMap[attr.Discriminator] = attr.DerivedType; - s_reverseMap[attr.DerivedType] = attr.Discriminator; + s_typeMap[attr.Discriminator] = attr.DerivedType; + // First [PolyType] for a given concrete type wins for writing (canonical discriminator). + // Additional attributes register read-only aliases for backwards compatibility. + s_reverseMap.TryAdd(attr.DerivedType, attr.Discriminator); } } diff --git a/Server/src/SOR.Game/Abilities/Models/Filters.cs b/Server/src/SOR.Game/Abilities/Models/Filters.cs index 6402d31..ecb1581 100644 --- a/Server/src/SOR.Game/Abilities/Models/Filters.cs +++ b/Server/src/SOR.Game/Abilities/Models/Filters.cs @@ -27,6 +27,7 @@ using SOR.Database.Enums; [PolyType(typeof(IsExactSelfFilter), "IsExactSelf")] // ── Tile filters ───────────────────────────────────────────────────────────── [PolyType(typeof(TileAffinityMatchesFilter), "TileAffinityMatches")] +[PolyType(typeof(TileAffinityMatchesFilter), "TileAffinityMatchesFilter")] // legacy alias (typo in admin v1) [PolyType(typeof(TileIsOccupiedFilter), "TileIsOccupied")] [PolyType(typeof(TileIsUnoccupiedFilter), "TileIsUnoccupied")] [PolyType(typeof(TileWithinRangeFilter), "TileWithinRange")]