From 9793cd25edeaf8f3885e946d9a32a59ac8450605 Mon Sep 17 00:00:00 2001
From: Chomp <dev@dev.sp-tarkov.com>
Date: Mon, 4 Aug 2025 13:38:56 +0100
Subject: [PATCH] Improved key lookup inside `ProcessPostRaidQuests()`

---
 .../SPTarkov.Server.Core/Models/Spt/Templates/Templates.cs     | 2 +-
 Libraries/SPTarkov.Server.Core/Services/DatabaseService.cs     | 2 +-
 .../SPTarkov.Server.Core/Services/LocationLifecycleService.cs  | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/Libraries/SPTarkov.Server.Core/Models/Spt/Templates/Templates.cs b/Libraries/SPTarkov.Server.Core/Models/Spt/Templates/Templates.cs
index d7227c23..d9f6af5e 100644
--- a/Libraries/SPTarkov.Server.Core/Models/Spt/Templates/Templates.cs
+++ b/Libraries/SPTarkov.Server.Core/Models/Spt/Templates/Templates.cs
@@ -23,7 +23,7 @@ public record Templates
     public Prestige? Prestige { get; set; }
 
     [JsonPropertyName("quests")]
-    public Dictionary<string, Quest> Quests { get; set; }
+    public Dictionary<MongoId, Quest> Quests { get; set; }
 
     [JsonPropertyName("repeatableQuests")]
     public RepeatableQuestDatabase RepeatableQuests { get; set; }
diff --git a/Libraries/SPTarkov.Server.Core/Services/DatabaseService.cs b/Libraries/SPTarkov.Server.Core/Services/DatabaseService.cs
index bcabab49..2dc1165a 100644
--- a/Libraries/SPTarkov.Server.Core/Services/DatabaseService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/DatabaseService.cs
@@ -241,7 +241,7 @@ public class DatabaseService(
     }
 
     /// <returns> assets/database/templates/quests.json </returns>
-    public Dictionary<string, Quest> GetQuests()
+    public Dictionary<MongoId, Quest> GetQuests()
     {
         if (databaseServer.GetTables().Templates?.Quests == null)
         {
diff --git a/Libraries/SPTarkov.Server.Core/Services/LocationLifecycleService.cs b/Libraries/SPTarkov.Server.Core/Services/LocationLifecycleService.cs
index 0f6da4f9..097fbed4 100644
--- a/Libraries/SPTarkov.Server.Core/Services/LocationLifecycleService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/LocationLifecycleService.cs
@@ -921,8 +921,7 @@ public class LocationLifecycleService(
         var failedQuests = questsToProcess.Where(quest => quest.Status == QuestStatusEnum.MarkedAsFailed);
         foreach (var failedQuest in failedQuests)
         {
-            var dbQuest = databaseService.GetQuests()[failedQuest.QId];
-            if (dbQuest is null)
+            if (!databaseService.GetQuests().TryGetValue(failedQuest.QId, out var dbQuest))
             {
                 continue;
             }