From eeddb97641b182ae981916cd846a3a80b3ec7fba Mon Sep 17 00:00:00 2001
From: Archangel <jesse@archangel.wtf>
Date: Fri, 4 Jul 2025 22:25:39 +0200
Subject: [PATCH] Remove extra method on Func, add options to converters

---
 .../Converters/BaseInteractionRequestDataConverter.cs    | 9 +++------
 .../Json/Converters/BaseSptLoggerReferenceConverter.cs   | 4 ++--
 .../Json/Converters/StringToObjectFactoryConverter.cs    | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/BaseInteractionRequestDataConverter.cs b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/BaseInteractionRequestDataConverter.cs
index 7b71bedc..0ca5136a 100644
--- a/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/BaseInteractionRequestDataConverter.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/BaseInteractionRequestDataConverter.cs
@@ -18,10 +18,7 @@ namespace SPTarkov.Server.Core.Utils.Json.Converters;
 
 public class BaseInteractionRequestDataConverter : JsonConverter<BaseInteractionRequestData>
 {
-    private static Dictionary<
-        string,
-        Func<string, JsonSerializerOptions, BaseInteractionRequestData?>
-    > _modHandlers = [];
+    private static Dictionary<string, Func<string, BaseInteractionRequestData?>> _modHandlers = [];
 
     public override BaseInteractionRequestData? Read(
         ref Utf8JsonReader reader,
@@ -250,7 +247,7 @@ public class BaseInteractionRequestDataConverter : JsonConverter<BaseInteraction
             default:
                 if (_modHandlers.TryGetValue(action, out var handler))
                 {
-                    return handler(jsonText, options);
+                    return handler(jsonText);
                 }
                 throw new Exception(
                     $"Unhandled action type {action}, make sure the BaseInteractionRequestDataConverter has the deserialization for this action handled."
@@ -260,7 +257,7 @@ public class BaseInteractionRequestDataConverter : JsonConverter<BaseInteraction
 
     public static void RegisterModDataHandler(
         string action,
-        Func<string, JsonSerializerOptions, BaseInteractionRequestData?> handler
+        Func<string, BaseInteractionRequestData?> handler
     )
     {
         if (!_modHandlers.TryAdd(action, handler))
diff --git a/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/BaseSptLoggerReferenceConverter.cs b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/BaseSptLoggerReferenceConverter.cs
index 5a538015..a238d056 100644
--- a/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/BaseSptLoggerReferenceConverter.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/BaseSptLoggerReferenceConverter.cs
@@ -22,9 +22,9 @@ public class BaseSptLoggerReferenceConverter : JsonConverter<BaseSptLoggerRefere
             switch (typeElement.GetString())
             {
                 case "File":
-                    return jsonDocument.Deserialize<FileSptLoggerReference>();
+                    return jsonDocument.Deserialize<FileSptLoggerReference>(options);
                 case "Console":
-                    return jsonDocument.Deserialize<ConsoleSptLoggerReference>();
+                    return jsonDocument.Deserialize<ConsoleSptLoggerReference>(options);
                 default:
                     throw new Exception(
                         $"The logger type '{typeElement.GetString()}' does not exist."
diff --git a/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/StringToObjectFactoryConverter.cs b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/StringToObjectFactoryConverter.cs
index 3457c3ed..108cc83d 100644
--- a/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/StringToObjectFactoryConverter.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/Json/Converters/StringToObjectFactoryConverter.cs
@@ -39,7 +39,7 @@ public class StringToObjectFactoryConverter : JsonConverterFactory
                     using (var jsonDocument = JsonDocument.ParseValue(ref reader))
                     {
                         var jsonText = jsonDocument.RootElement.GetRawText();
-                        return JsonSerializer.Deserialize<T>(jsonText);
+                        return JsonSerializer.Deserialize<T>(jsonText, options);
                     }
             }