From 53a51d82e6b4abadf66f281afe3799ec296d6740 Mon Sep 17 00:00:00 2001
From: Chomp <dev@dev.sp-tarkov.com>
Date: Fri, 7 Feb 2025 15:43:34 +0000
Subject: [PATCH] Fixed expired flea offers being purged too early and causing
 errors

---
 Libraries/Core/Servers/RagfairServer.cs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Libraries/Core/Servers/RagfairServer.cs b/Libraries/Core/Servers/RagfairServer.cs
index 5044eb23..a7878d6a 100644
--- a/Libraries/Core/Servers/RagfairServer.cs
+++ b/Libraries/Core/Servers/RagfairServer.cs
@@ -30,7 +30,6 @@ public class RagfairServer(
 
     public void Update()
     {
-        _ragfairOfferService.ExpireStaleOffers();
         // Generate trader offers
         var traders = GetUpdateableTraders();
         foreach (var traderId in traders)
@@ -44,11 +43,14 @@ public class RagfairServer(
         // Regenerate expired offers when over threshold limit
         if (_ragfairOfferService.GetExpiredOfferCount() >= _ragfairConfig.Dynamic.ExpiredOfferThreshold)
         {
+            // Must occur BEFORE "ExpireStaleOffers"
             var expiredAssortsWithChildren = _ragfairOfferService.GetExpiredOfferAssorts();
             _ragfairOfferGenerator.GenerateDynamicOffers(expiredAssortsWithChildren);
 
-            // Clear out expired offers now we've generated them
-            _ragfairOfferService.ResetExpiredOffers();
+            _ragfairOfferService.ExpireStaleOffers();
+
+            // Clear out expired offers now we've regenerated them
+            _ragfairOfferService.ResetExpiredOfferIds();
         }
 
         _ragfairRequiredItemsService.BuildRequiredItemTable();