From 0e675129a0132bbc852acb72648ac1b4be3c3d04 Mon Sep 17 00:00:00 2001 From: sp-tarkov-bot Date: Tue, 4 Nov 2025 22:57:41 +0000 Subject: [PATCH 1/3] Format Style Fixes --- .../SPT_Data/configs/seasonalevents.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/seasonalevents.json b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/seasonalevents.json index 1c9df212..819f7e33 100644 --- a/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/seasonalevents.json +++ b/Libraries/SPTarkov.Server.Assets/SPT_Data/configs/seasonalevents.json @@ -13980,21 +13980,21 @@ } ] }, - "summon": { - "default": [ - { + "summon": { + "default": [ + { "AlwaysEnemies": [], - "AlwaysFriends": [], + "AlwaysFriends": [], "BearPlayerBehaviour": "AlwaysFriends", "BotRole": "peacefullZryachiyEvent", "ChancedEnemies": [], "SavageEnemyChance": 0, - "BearEnemyChance": 0, - "UsecEnemyChance": 0, + "BearEnemyChance": 0, + "UsecEnemyChance": 0, "SavagePlayerBehaviour": "AlwaysFriends", "UsecPlayerBehaviour": "AlwaysFriends" } - ] - } + ] + } } } From 4eecb485c631592625dbb23c30ee54f835ff34a6 Mon Sep 17 00:00:00 2001 From: Archangel Date: Wed, 5 Nov 2025 14:41:28 +0100 Subject: [PATCH 2/3] Mark various removed implementations as obsolete --- Libraries/SPTarkov.Server.Core/DI/ServiceLocator.cs | 2 ++ Libraries/SPTarkov.Server.Core/Servers/SaveServer.cs | 3 +++ 2 files changed, 5 insertions(+) diff --git a/Libraries/SPTarkov.Server.Core/DI/ServiceLocator.cs b/Libraries/SPTarkov.Server.Core/DI/ServiceLocator.cs index a2265fa9..1bc77c17 100644 --- a/Libraries/SPTarkov.Server.Core/DI/ServiceLocator.cs +++ b/Libraries/SPTarkov.Server.Core/DI/ServiceLocator.cs @@ -6,8 +6,10 @@ /// /// This should not be used at all when having direct access to DI. /// +[Obsolete("This will be removed in the next version of SPT in favor of DI injecting patches")] public static class ServiceLocator { + [Obsolete("This will be removed in the next version of SPT in favor of DI injecting patches")] public static IServiceProvider ServiceProvider { get; private set; } internal static void SetServiceProvider(IServiceProvider provider) diff --git a/Libraries/SPTarkov.Server.Core/Servers/SaveServer.cs b/Libraries/SPTarkov.Server.Core/Servers/SaveServer.cs index 4f504f2a..e18b18c9 100644 --- a/Libraries/SPTarkov.Server.Core/Servers/SaveServer.cs +++ b/Libraries/SPTarkov.Server.Core/Servers/SaveServer.cs @@ -31,6 +31,7 @@ public class SaveServer( protected const string profileFilepath = "user/profiles/"; // onLoad = require("../bindings/SaveLoad"); + [Obsolete("This will be removed in the next version of SPT")] protected readonly Dictionary> onBeforeSaveCallbacks = new(); protected readonly ConcurrentDictionary profiles = new(); @@ -42,6 +43,7 @@ public class SaveServer( /// /// ID for the save callback /// Callback to execute prior to running SaveServer.saveProfile() + [Obsolete("This will be removed in the next version of SPT")] public void AddBeforeSaveCallback(string id, Func callback) { onBeforeSaveCallbacks[id] = callback; @@ -51,6 +53,7 @@ public class SaveServer( /// Remove a callback from being executed prior to saving profile in SaveServer.saveProfile() /// /// ID of Callback to remove + [Obsolete("This will be removed in the next version of SPT")] public void RemoveBeforeSaveCallback(string id) { onBeforeSaveCallbacks.Remove(id); From 3a5f285fc5c7008ab7577a37b7653f3ada7eee5d Mon Sep 17 00:00:00 2001 From: Archangel Date: Wed, 5 Nov 2025 14:56:21 +0100 Subject: [PATCH 3/3] Add obsolete markers --- Libraries/SPTarkov.Reflection/Patching/ModPatchCache.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Libraries/SPTarkov.Reflection/Patching/ModPatchCache.cs b/Libraries/SPTarkov.Reflection/Patching/ModPatchCache.cs index c3dbda21..e99a4a10 100644 --- a/Libraries/SPTarkov.Reflection/Patching/ModPatchCache.cs +++ b/Libraries/SPTarkov.Reflection/Patching/ModPatchCache.cs @@ -3,6 +3,7 @@ namespace SPTarkov.Reflection.Patching; /// /// Cache of active patches for mod developers to use for compatibility reasons /// +[Obsolete("Patches will be injectable through IEnumerable in SPT 4.1, making this redundant")] public static class ModPatchCache { private static readonly List _activePatches = []; @@ -22,6 +23,7 @@ public static class ModPatchCache /// /// This should never be called before PreSptLoad is completed, otherwise could be empty. /// + [Obsolete("Patches will be injectable through IEnumerable in SPT 4.1, making this redundant")] public static IReadOnlyList GetActivePatches() { // We're not exposing _activePatches so it cant be altered outside of this class. Do NOT implement this as a property. @@ -38,6 +40,7 @@ public static class ModPatchCache /// /// This should never be called before PreSptLoad is completed, otherwise could be empty. /// + [Obsolete("Patches will be injectable through IEnumerable in SPT 4.1, making this redundant")] public static List GetActivePatchedMethodNames() { var result = new List();