From 8177093b1657375d1609d003aee3cf81ad6437e2 Mon Sep 17 00:00:00 2001 From: Chomp Date: Mon, 8 Sep 2025 12:48:06 +0100 Subject: [PATCH] Updated `EnsureItemHasValidStackCount` to be an extension method --- .../Controllers/InventoryController.cs | 23 ++----------------- .../Extensions/ItemExtensions.cs | 19 +++++++++++++++ 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Libraries/SPTarkov.Server.Core/Controllers/InventoryController.cs b/Libraries/SPTarkov.Server.Core/Controllers/InventoryController.cs index 930995e2..78ac9ea9 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/InventoryController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/InventoryController.cs @@ -856,8 +856,8 @@ public class InventoryController( return; } - EnsureItemHasValidStackCount(destinationItem); - EnsureItemHasValidStackCount(sourceItem); + destinationItem.EnsureItemHasValidStackCount(); + sourceItem.EnsureItemHasValidStackCount(); // Merging non Found in Raid (SpawnedInSession) items with FiR item causing result to be not Found in Raid if (!sourceItem.Upd.SpawnedInSession.GetValueOrDefault(false) && destinationItem.Upd.SpawnedInSession.GetValueOrDefault(false)) @@ -881,25 +881,6 @@ public class InventoryController( } } - /// - /// Ensure an item has a upd object with a stack count of 1 - /// - /// Item to check - protected void EnsureItemHasValidStackCount(Item item) - { - if (item.Upd is null) - { - item.AddUpd(); - item.Upd.StackObjectsCount = 1; - } - - if (item.Upd.StackObjectsCount is null or 0) - { - // Items pulled out of raid can have no stack count, default to 1 - item.Upd.StackObjectsCount = 1; - } - } - /// /// Split Item stack - 1 stack into 2 /// diff --git a/Libraries/SPTarkov.Server.Core/Extensions/ItemExtensions.cs b/Libraries/SPTarkov.Server.Core/Extensions/ItemExtensions.cs index d82731e1..4931c158 100644 --- a/Libraries/SPTarkov.Server.Core/Extensions/ItemExtensions.cs +++ b/Libraries/SPTarkov.Server.Core/Extensions/ItemExtensions.cs @@ -530,4 +530,23 @@ public static class ItemExtensions return true; } + + /// + /// Ensure an item has an upd object with a stack count of 1 + /// + /// Item to check + public static void EnsureItemHasValidStackCount(this Item item) + { + if (item.Upd is null) + { + item.AddUpd(); + item.Upd.StackObjectsCount = 1; + } + + if (item.Upd.StackObjectsCount is null or 0) + { + // Items pulled out of raid can have no stack count, default to 1 + item.Upd.StackObjectsCount = 1; + } + } }