From e0cceab7fad579b43b0ff0e6de9a6c253ee1e508 Mon Sep 17 00:00:00 2001
From: Chomp <dev@dev.sp-tarkov.com>
Date: Tue, 27 May 2025 16:27:23 +0100
Subject: [PATCH] Added nullguard to `GetLoadedServerMods()`

---
 .../Controllers/LauncherController.cs                  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Libraries/SPTarkov.Server.Core/Controllers/LauncherController.cs b/Libraries/SPTarkov.Server.Core/Controllers/LauncherController.cs
index a81bd754..d4ddef63 100644
--- a/Libraries/SPTarkov.Server.Core/Controllers/LauncherController.cs
+++ b/Libraries/SPTarkov.Server.Core/Controllers/LauncherController.cs
@@ -242,15 +242,13 @@ public class LauncherController(
     /// <returns>Dictionary of mod name and mod details</returns>
     public Dictionary<string, AbstractModMetadata> GetLoadedServerMods()
     {
-        var mods = _applicationContext?.GetLatestValue(ContextVariableType.LOADED_MOD_ASSEMBLIES).GetValue<List<SptMod>>();
-        var result = new Dictionary<string, AbstractModMetadata>();
-
-        foreach (var sptMod in mods)
+        var mods = _applicationContext?.GetLatestValue(ContextVariableType.LOADED_MOD_ASSEMBLIES)?.GetValue<List<SptMod>>();
+        if (mods == null)
         {
-            result.Add(sptMod.ModMetadata.Name, sptMod.ModMetadata);
+            return [];
         }
 
-        return result;
+        return mods.ToDictionary(sptMod => sptMod.ModMetadata?.Name ?? "UNKNOWN MOD", sptMod => sptMod.ModMetadata);
     }
 
     /// <summary>