From 9ce2f4a4f6c1ce52ff7e6b114c5d53fdaf576700 Mon Sep 17 00:00:00 2001
From: Archangel <jesse@archangel.wtf>
Date: Thu, 11 Dec 2025 22:57:29 +0100
Subject: [PATCH] Further improve FilterCartridges

---
 .../Services/BotEquipmentFilterService.cs         | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/Libraries/SPTarkov.Server.Core/Services/BotEquipmentFilterService.cs b/Libraries/SPTarkov.Server.Core/Services/BotEquipmentFilterService.cs
index bb61c163..94728b50 100644
--- a/Libraries/SPTarkov.Server.Core/Services/BotEquipmentFilterService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/BotEquipmentFilterService.cs
@@ -281,16 +281,13 @@ public class BotEquipmentFilterService(
                     continue;
                 }
 
-                // Loop over each cartridge + weight
-                // Clear all cartridges ready for whitelist to be added
-                foreach (var ammoKvP in cartridges)
-                // Cartridge not on whitelist
+                // Get all cartridges that aren't on the whitelist
+                var cartridgesToRemove = cartridges.Keys.Where(cartridge => !matchingWhitelist.Contains(cartridge)).ToList();
+
+                // Remove said cartridges from the original dictionary
+                foreach (var cartridge in cartridgesToRemove)
                 {
-                    if (!matchingWhitelist.Contains(ammoKvP.Key))
-                    // Remove
-                    {
-                        cartridges.Remove(ammoKvP.Key);
-                    }
+                    cartridges.Remove(cartridge);
                 }
             }