From 40ace1712d3be4d89430de65e9814bbaf48c6c3a Mon Sep 17 00:00:00 2001
From: Chomp <dev@dev.sp-tarkov.com>
Date: Mon, 16 Jun 2025 12:59:32 +0100
Subject: [PATCH] Fixed cancelled/expired player offer items not being returned
 #400

We were missing player offer processing when handling stale offers
---
 .../SPTarkov.Server.Core/Services/RagfairOfferService.cs | 9 +++++++--
 .../SPTarkov.Server.Core/Utils/RagfairOfferHolder.cs     | 9 +++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Libraries/SPTarkov.Server.Core/Services/RagfairOfferService.cs b/Libraries/SPTarkov.Server.Core/Services/RagfairOfferService.cs
index b1fc2d1f..52abab2e 100644
--- a/Libraries/SPTarkov.Server.Core/Services/RagfairOfferService.cs
+++ b/Libraries/SPTarkov.Server.Core/Services/RagfairOfferService.cs
@@ -151,11 +151,16 @@ public class RagfairOfferService(
     }
 
     /// <summary>
-    ///     Process stored offer ids and remove expired
+    ///     Process cached expired offer ids
     /// </summary>
     public void RemoveExpiredOffers()
     {
-        ragfairOfferHolder.RemoveExpiredOffers();
+        // Gather all stale offers
+        var staleOffersIds = ragfairOfferHolder.GetStaleOfferIds();
+        foreach (var offerId in staleOffersIds)
+        {
+            ProcessStaleOffer(offerId);
+        }
 
         // Clear out expired offer ids now we've regenerated them
         ragfairOfferHolder.ResetExpiredOfferIds();
diff --git a/Libraries/SPTarkov.Server.Core/Utils/RagfairOfferHolder.cs b/Libraries/SPTarkov.Server.Core/Utils/RagfairOfferHolder.cs
index a3177ae0..cd0c334d 100644
--- a/Libraries/SPTarkov.Server.Core/Utils/RagfairOfferHolder.cs
+++ b/Libraries/SPTarkov.Server.Core/Utils/RagfairOfferHolder.cs
@@ -36,6 +36,15 @@ public class RagfairOfferHolder(
         return _offersById.GetValueOrDefault(id);
     }
 
+    /// <summary>
+    ///     Get a ragfair offer by its id
+    /// </summary>
+    /// <returns>RagfairOffer</returns>
+    public HashSet<string> GetStaleOfferIds()
+    {
+        return _expiredOfferIds;
+    }
+
     /// <summary>
     ///     Get ragfair offers that match the passed in tpl
     /// </summary>