From e5be536269000cb23a544747fba6af06c9bb4d45 Mon Sep 17 00:00:00 2001
From: Chomp <dev@dev.sp-tarkov.com>
Date: Thu, 7 Aug 2025 18:12:57 +0100
Subject: [PATCH] Moved properties closer to their usage inside
 `ItemAllowedInContainer()` + improved nullhguard

---
 .../SPTarkov.Server.Core/Helpers/BotGeneratorHelper.cs     | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Libraries/SPTarkov.Server.Core/Helpers/BotGeneratorHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/BotGeneratorHelper.cs
index 8e6bec40..9985f938 100644
--- a/Libraries/SPTarkov.Server.Core/Helpers/BotGeneratorHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/BotGeneratorHelper.cs
@@ -635,10 +635,7 @@ public class BotGeneratorHelper(
     protected bool ItemAllowedInContainer(Grid? slotGrid, MongoId itemTpl)
     {
         var propFilters = slotGrid?.Props?.Filters;
-        var excludedFilter = propFilters?.FirstOrDefault()?.ExcludedFilter ?? [];
-        var filter = propFilters?.FirstOrDefault()?.Filter ?? [];
-
-        if (!propFilters.Any())
+        if (propFilters is null || !propFilters.Any())
         // no filters, item is fine to add
         {
             return true;
@@ -648,12 +645,14 @@ public class BotGeneratorHelper(
         var itemDetails = itemHelper.GetItem(itemTpl).Value;
 
         // if item to add is found in exclude filter, not allowed
+        var excludedFilter = propFilters.FirstOrDefault()?.ExcludedFilter ?? [];
         if (excludedFilter.Contains(itemDetails?.Parent ?? string.Empty))
         {
             return false;
         }
 
         // If Filter array only contains 1 filter and it is for basetype 'item', allow it
+        var filter = propFilters.FirstOrDefault()?.Filter ?? [];
         if (filter.Count == 1 && filter.Contains(BaseClasses.ITEM))
         {
             return true;