Fix Insured item...is null error (#1110)

- `mapInsuredItemsToTrader` should be using the pre-raid PMC profile, as the request profile isn't copied over after this method is run - Add a new profileFixer method to clean up old orphaned InsuredItems --------- Co-authored-by: DrakiaXYZ <[email protected]>
sp-tarkov · Feb 15, 2025 · 2c29b4e · 2c29b4e
1 parent 78fb73d
commit 2c29b4e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/project/src/services/LocationLifecycleService.ts b/project/src/services/LocationLifecycleService.ts
@@ -1004,7 +1004,7 @@ export class LocationLifecycleService {
             const mappedItems = this.insuranceService.mapInsuredItemsToTrader(
                 sessionId,
                 request.lostInsuredItems,
-                request.results.profile,
+                preRaidPmcProfile,
             );
 
             // Is possible to have items in lostInsuredItems but removed before reaching mappedItems

diff --git a/project/src/services/ProfileFixerService.ts b/project/src/services/ProfileFixerService.ts
@@ -67,6 +67,7 @@ export class ProfileFixerService {
         this.removeOrphanedQuests(pmcProfile);
         this.verifyQuestProductionUnlocks(pmcProfile);
         this.fixFavorites(pmcProfile);
+        this.fixOrphanedInsurance(pmcProfile);
 
         if (pmcProfile.Hideout) {
             this.addHideoutEliteSlots(pmcProfile);
@@ -406,6 +407,18 @@ export class ProfileFixerService {
         }
     }
 
+    /**
+     * Remove any entries from `pmcProfile.InsuredItems` that do not have a corresponding
+     * `pmcProfile.Inventory.items` entry
+     * @param pmcProfile 
+     */
+    protected fixOrphanedInsurance(pmcProfile: IPmcData): void {
+        pmcProfile.InsuredItems = pmcProfile.InsuredItems.filter((insuredItem) => {
+            // Check if the player inventory contains this item
+            return pmcProfile.Inventory.items.some((item) => item._id === insuredItem.itemId);
+        });
+    }
+
     /**
      * If the profile has elite Hideout Managment skill, add the additional slots from globals
      * NOTE: This seems redundant, but we will leave it here just incase.