From cb6a0cd2837adda6f006ea04214028dfb1f25f5a Mon Sep 17 00:00:00 2001
From: Chomp <dev@dev.sp-tarkov.com>
Date: Mon, 27 Jan 2025 10:50:41 +0000
Subject: [PATCH] Fixed `unable_to_generate_static_loot` warning

hardened `GenerateStaticContainers` from nullref errors
---
 .../Core/Generators/LocationLootGenerator.cs  | 30 ++++++++++---------
 Libraries/Core/Models/Eft/Common/Location.cs  |  5 +---
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/Libraries/Core/Generators/LocationLootGenerator.cs b/Libraries/Core/Generators/LocationLootGenerator.cs
index be5f9019..9e459292 100644
--- a/Libraries/Core/Generators/LocationLootGenerator.cs
+++ b/Libraries/Core/Generators/LocationLootGenerator.cs
@@ -146,14 +146,14 @@ public class LocationLootGenerator(
         }
 
         // Group containers by their groupId
-        if (mapData.StaticContainer is null)
+        if (mapData.Statics is null)
         {
             _logger.Warning(_localisationService.GetText("location-unable_to_generate_static_loot", locationId));
 
             return result;
         }
 
-        var mapping = GetGroupIdToContainerMappings(mapData.StaticContainer, staticRandomisableContainersOnMap);
+        var mapping = GetGroupIdToContainerMappings(mapData.Statics, staticRandomisableContainersOnMap);
 
         // For each of the container groups, choose from the pool of containers, hydrate container with loot and add to result array
         foreach (var (key, data) in mapping)
@@ -316,8 +316,7 @@ public class LocationLootGenerator(
         var mapping = new Dictionary<string, ContainerGroupCount>();
         foreach (var groupKvP in staticContainerGroupData.ContainersGroups)
         {
-            var groupData = staticContainerGroupData.ContainersGroups[groupKvP.Key];
-            if (!mapping.ContainsKey(groupKvP.Key))
+            if (!staticContainerGroupData.ContainersGroups.TryGetValue(groupKvP.Key, out var groupData))
             {
                 mapping[groupKvP.Key] = new ContainerGroupCount
                 {
@@ -338,14 +337,13 @@ public class LocationLootGenerator(
 
         // Add an empty group for containers without a group id but still have a < 100% chance to spawn
         // Likely bad BSG data, will be fixed...eventually, example of the groupids: `NEED_TO_BE_FIXED1`,`NEED_TO_BE_FIXED_SE02`, `NEED_TO_BE_FIXED_NW_01`
-        mapping[""] = new ContainerGroupCount { ChosenCount = -1 };
+        mapping[""] = new ContainerGroupCount { ContainerIdsWithProbability = new Dictionary<string, double>(), ChosenCount = -1 };
 
         // Iterate over all containers and add to group keyed by groupId
         // Containers without a group go into a group with empty key ""
         foreach (var container in staticContainersOnMap)
         {
-            var groupData = staticContainerGroupData.Containers[container.Template.Id];
-            if (groupData is null)
+            if (!staticContainerGroupData.Containers.TryGetValue(container.Template.Id, out var groupData))
             {
                 _logger.Error(
                     _localisationService.GetText(
@@ -357,7 +355,7 @@ public class LocationLootGenerator(
                 continue;
             }
 
-            if (container.Probability == 1)
+            if (container.Probability >= 1)
             {
                 _logger.Debug(
                     $"Container {container.Template.Id} with group ${groupData.GroupId} had 100 % chance to spawn was picked as random container, skipping"
@@ -366,7 +364,12 @@ public class LocationLootGenerator(
                 continue;
             }
 
-            mapping[groupData.GroupId].ContainerIdsWithProbability[container.Template.Id] = container.Probability.Value;
+            mapping.TryAdd(groupData.GroupId, new ContainerGroupCount
+            {
+                ChosenCount = 0d,
+                ContainerIdsWithProbability = new Dictionary<string, double>()
+            });
+            mapping[groupData.GroupId].ContainerIdsWithProbability.TryAdd(container.Template.Id, container.Probability.Value);
         }
 
         return mapping;
@@ -462,15 +465,14 @@ public class LocationLootGenerator(
             );
 
             var rotation = result.Rotation.GetValueOrDefault(false) ? 1 : 0;
-
+             
             items[0].SlotId = "main";
             items[0].Location = new ItemLocation{ X = result.X, Y = result.Y, R = rotation };
 
             // Add loot to container before returning
-            foreach (var item in items)
-            {
-                containerClone.Template.Items.Add(item);
-            }
+            containerClone.Template.Items.AddRange(items);
+
+            itemAddedCount++;
         }
 
         return containerClone;
diff --git a/Libraries/Core/Models/Eft/Common/Location.cs b/Libraries/Core/Models/Eft/Common/Location.cs
index 8c04b7a4..d83638d0 100644
--- a/Libraries/Core/Models/Eft/Common/Location.cs
+++ b/Libraries/Core/Models/Eft/Common/Location.cs
@@ -27,14 +27,11 @@ public record Location
 
     /** All possible static containers on map + their assign groupings */
     [JsonPropertyName("statics")]
-    public StaticContainer? StaticContainer { get; set; }
+    public StaticContainer? Statics { get; set; }
 
     /** All possible map extracts */
     [JsonPropertyName("allExtracts")]
     public Exit[] AllExtracts { get; set; }
-
-    [Obsolete("USE StaticContainer INSTEAD")]
-    public object Statics { get; set; }
 }
 
 public record StaticContainer