From a2d2a44a2f8e6d5b14f6455999b08f5e90d48376 Mon Sep 17 00:00:00 2001 From: Chomp Date: Fri, 30 May 2025 20:05:51 +0100 Subject: [PATCH] Improved logic flow inside `AddItemsToInventory` --- .../SPTarkov.Server.Core/Helpers/InRaidHelper.cs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/Libraries/SPTarkov.Server.Core/Helpers/InRaidHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/InRaidHelper.cs index a86e0aa0..5e13bec5 100644 --- a/Libraries/SPTarkov.Server.Core/Helpers/InRaidHelper.cs +++ b/Libraries/SPTarkov.Server.Core/Helpers/InRaidHelper.cs @@ -124,24 +124,20 @@ public class InRaidHelper( /// /// Items we want to add /// Location to add items to - protected void AddItemsToInventory(List itemsToAdd, List serverInventoryItems) + protected void AddItemsToInventory(IEnumerable itemsToAdd, List serverInventoryItems) { foreach (var itemToAdd in itemsToAdd) { // Try to find index of item to determine if we should add or replace - var existingItemIndex = serverInventoryItems.FindIndex(inventoryItem => inventoryItem.Id == itemToAdd.Id - ); + var existingItemIndex = serverInventoryItems.FindIndex(inventoryItem => inventoryItem.Id == itemToAdd.Id); if (existingItemIndex != -1) { - // Replace item with one from client + // Replace existing item serverInventoryItems.RemoveAt(existingItemIndex); - serverInventoryItems.Add(itemToAdd); - } - else - { - // Not found, add - serverInventoryItems.Add(itemToAdd); } + + // Add new item + serverInventoryItems.Add(itemToAdd); } }