From b1aa8f0942b5fd596f386ae20de3b46505b80654 Mon Sep 17 00:00:00 2001
From: Chomp <dev@dev.sp-tarkov.com>
Date: Fri, 25 Jul 2025 20:09:07 +0100
Subject: [PATCH] Removed unnecessary `??`

---
 .../Generators/BotInventoryGenerator.cs                   | 2 +-
 Libraries/SPTarkov.Server.Core/Helpers/ItemHelper.cs      | 8 ++++----
 Libraries/SPTarkov.Server.Core/Helpers/TradeHelper.cs     | 2 +-
 Libraries/SPTarkov.Server.Core/Services/PaymentService.cs | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Libraries/SPTarkov.Server.Core/Generators/BotInventoryGenerator.cs b/Libraries/SPTarkov.Server.Core/Generators/BotInventoryGenerator.cs
index aec35b16..0bca7426 100644
--- a/Libraries/SPTarkov.Server.Core/Generators/BotInventoryGenerator.cs
+++ b/Libraries/SPTarkov.Server.Core/Generators/BotInventoryGenerator.cs
@@ -506,7 +506,7 @@ public class BotInventoryGenerator(
         }
 
         // Roll dice on equipment item
-        var shouldSpawn = randomUtil.GetChance100(spawnChance ?? 0);
+        var shouldSpawn = randomUtil.GetChance100(spawnChance.Value);
         if (shouldSpawn && settings.RootEquipmentPool.Any())
         {
             TemplateItem? pickedItemDb = null;
diff --git a/Libraries/SPTarkov.Server.Core/Helpers/ItemHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/ItemHelper.cs
index 3a7f6660..c9ff48a9 100644
--- a/Libraries/SPTarkov.Server.Core/Helpers/ItemHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/ItemHelper.cs
@@ -804,9 +804,9 @@ public class ItemHelper(
             return rootAndChildren;
         }
 
-        while (remainingCount.Value != 0)
+        while (remainingCount > 0)
         {
-            var amount = Math.Min(remainingCount ?? 0, maxStackSize ?? 0);
+            var amount = Math.Min(remainingCount.Value, maxStackSize ?? 0);
             var newStackClone = cloner.Clone(itemToSplit);
 
             newStackClone.Id = new MongoId();
@@ -845,13 +845,13 @@ public class ItemHelper(
             return result;
         }
 
-        while (remainingCount.Value != 0)
+        while (remainingCount > 0)
         {
             // Clone item and make IDs unique
             var itemWithChildrenClone = cloner.Clone(itemWithChildren).ReplaceIDs().ToList();
 
             // Set stack count to new value
-            var amount = Math.Min(remainingCount ?? 0, maxStackSize ?? 0);
+            var amount = Math.Min(remainingCount.Value, maxStackSize ?? 0);
             itemWithChildrenClone[0].Upd.StackObjectsCount = amount;
             remainingCount -= amount;
             result.Add(itemWithChildrenClone);
diff --git a/Libraries/SPTarkov.Server.Core/Helpers/TradeHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/TradeHelper.cs
index 91f76d6f..69941fe8 100644
--- a/Libraries/SPTarkov.Server.Core/Helpers/TradeHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/TradeHelper.cs
@@ -245,7 +245,7 @@ public class TradeHelper(
             {
                 var offerClone = cloner.Clone(offerItems);
                 // Handle stackable items that have a max stack size limit
-                var itemCountToSend = Math.Min(itemMaxStackSize ?? 0, itemsToSendRemaining ?? 0);
+                var itemCountToSend = Math.Min(itemMaxStackSize ?? 0, itemsToSendRemaining.Value);
                 offerClone.FirstOrDefault().Upd.StackObjectsCount = itemCountToSend;
 
                 // Prevent any collisions
diff --git a/Libraries/SPTarkov.Server.Core/Services/PaymentService.cs b/Libraries/SPTarkov.Server.Core/Services/PaymentService.cs
index 42883b5e..b50069bb 100644
--- a/Libraries/SPTarkov.Server.Core/Services/PaymentService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/PaymentService.cs
@@ -356,7 +356,7 @@ public class PaymentService(
             var itemAmount = profileMoneyItem.Upd.StackObjectsCount;
             if (leftToPay >= itemAmount)
             {
-                leftToPay -= itemAmount ?? 0;
+                leftToPay -= itemAmount.Value;
                 inventoryHelper.RemoveItem(pmcData, profileMoneyItem.Id, sessionID, output);
             }
             else