From 8312dacc253e232978ad5a8b0a9b8f5eaaef5935 Mon Sep 17 00:00:00 2001
From: CWX <cwxdev@outlook.com>
Date: Sun, 20 Apr 2025 13:27:47 +0100
Subject: [PATCH] seperate logic to see result easier, fix logic for defaulting

---
 Libraries/SPTarkov.Server.Core/Helpers/QuestHelper.cs    | 9 ++++-----
 .../SPTarkov.Server.Core/Helpers/RagfairOfferHelper.cs   | 3 ++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Libraries/SPTarkov.Server.Core/Helpers/QuestHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/QuestHelper.cs
index ffde53fc..74289401 100644
--- a/Libraries/SPTarkov.Server.Core/Helpers/QuestHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/QuestHelper.cs
@@ -1006,15 +1006,14 @@ public class QuestHelper(
      * @param pmcData Profile to get hours for
      * @returns Hours item will be available for
      */
-    public double? GetMailItemRedeemTimeHoursForProfile(PmcData pmcData)
+    public double GetMailItemRedeemTimeHoursForProfile(PmcData pmcData)
     {
-        var value = _questConfig.MailRedeemTimeHours.GetValueOrDefault(pmcData.Info.GameVersion);
-        if (value is null)
+        if (!_questConfig.MailRedeemTimeHours.TryGetValue(pmcData.Info.GameVersion, out var value))
         {
-            return 0;
+            return _questConfig.MailRedeemTimeHours["default"] ?? 48;
         }
 
-        return value;
+        return value ?? 48;
     }
 
     public ItemEventRouterResponse CompleteQuest(PmcData pmcData, CompleteQuestRequestData body, string sessionID)
diff --git a/Libraries/SPTarkov.Server.Core/Helpers/RagfairOfferHelper.cs b/Libraries/SPTarkov.Server.Core/Helpers/RagfairOfferHelper.cs
index f1cc6b16..38aa86e7 100644
--- a/Libraries/SPTarkov.Server.Core/Helpers/RagfairOfferHelper.cs
+++ b/Libraries/SPTarkov.Server.Core/Helpers/RagfairOfferHelper.cs
@@ -796,13 +796,14 @@ public class RagfairOfferHelper(
             HandbookId = itemTpl
         };
 
+        var storagetime = _timeUtil.GetHoursAsSeconds((int) _questHelper.GetMailItemRedeemTimeHoursForProfile(sellerProfile));
         _mailSendService.SendDirectNpcMessageToPlayer(
             offerOwnerSessionId,
             Traders.RAGMAN,
             MessageType.FLEAMARKET_MESSAGE,
             GetLocalisedOfferSoldMessage(itemTpl, boughtAmount),
             paymentItemsToSendToPlayer,
-            _timeUtil.GetHoursAsSeconds((int) _questHelper.GetMailItemRedeemTimeHoursForProfile(sellerProfile).Value),
+            storagetime,
             null,
             ragfairDetails
         );