From 735b5956e6d951066f4fa3d7062cc8e6952e1c00 Mon Sep 17 00:00:00 2001 From: Chomp Date: Sat, 30 Aug 2025 16:55:04 +0100 Subject: [PATCH] Fixed BTR drive service issues #580 --- .../Models/Eft/Common/Tables/LocationServices.cs | 1 + .../Utils/Json/Converters/EftEnumConverter.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationServices.cs b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationServices.cs index dd18efe5..53feb80f 100644 --- a/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationServices.cs +++ b/Libraries/SPTarkov.Server.Core/Models/Eft/Common/Tables/LocationServices.cs @@ -50,6 +50,7 @@ public record TraderService public string TraderId { get; set; } [JsonPropertyName("TraderServiceType")] + [JsonConverter(typeof(JsonStringEnumConverter))] public TraderServiceType TraderServiceType { get; set; } [JsonPropertyName("Requirements")] diff --git a/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftEnumConverter.cs b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftEnumConverter.cs index 4bcdab13..17af33f2 100644 --- a/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftEnumConverter.cs +++ b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/EftEnumConverter.cs @@ -21,7 +21,7 @@ public class EftEnumConverter : JsonConverter { public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) { - if (reader.TokenType == JsonTokenType.String || reader.TokenType == JsonTokenType.PropertyName) + if (reader.TokenType is JsonTokenType.String or JsonTokenType.PropertyName) { var str = reader.GetString(); return (T)Enum.Parse(typeof(T), str, true);