Merge branch 'disable-gc-requests' of https://github.com/sp-tarkov/server-csharp into disable-gc-requests

Libraries/SPTarkov.Server.Core/Controllers/RagfairController.cs

@@ -84,7 +84,7 @@ public class RagfairController(
         var traderAssorts = ragfairHelper.GetDisplayableAssorts(sessionID);
         var result = new GetOffersResult
         {
-            Offers = [],
+            Offers = null,
             OffersCount = searchRequest.Limit,
             SelectedCategory = searchRequest.HandbookId,
         };

Libraries/SPTarkov.Server.Core/Helpers/HealthHelper.cs

@@ -41,8 +41,10 @@ public class HealthHelper(ISptLogger<HealthHelper> logger, TimeUtil timeUtil, Co
             throw new HealthHelperException(message);
         }
 
+        var playerWasCursed = !PlayerHadGearOnRaidStart(pmcProfileToUpdate.Inventory);
+
         // Alter saved profiles Health with values from post-raid client data
-        ModifyProfileHealthProperties(pmcProfileToUpdate, healthChanges.BodyParts, EffectsToSkip);
+        ModifyProfileHealthProperties(pmcProfileToUpdate, healthChanges.BodyParts, EffectsToSkip, playerWasCursed);
 
         // Adjust hydration/energy/temperature
         AdjustProfileHydrationEnergyTemperature(pmcProfileToUpdate, healthChanges);
@@ -58,16 +60,55 @@ public class HealthHelper(ISptLogger<HealthHelper> logger, TimeUtil timeUtil, Co
         pmcProfileToUpdate.Health.UpdateTime = timeUtil.GetTimeStamp();
     }
 
+    /// <summary>
+    /// Did the player start raid with gear, if false, they are 'cursed'
+    /// </summary>
+    /// <param name="inventory">Players inventory at start of raid</param>
+    /// <returns>True = they had enough gear to not be classed as 'cursed'</returns>
+    protected bool PlayerHadGearOnRaidStart(BotBaseInventory inventory)
+    {
+        if (inventory?.Items == null)
+        {
+            return false;
+        }
+
+        var hasWeapon = false;
+        var hasVestRigOrBackpack = false;
+        foreach (var item in inventory.Items)
+        {
+            // Possible early escape
+            if (hasWeapon && hasVestRigOrBackpack)
+            {
+                return true;
+            }
+
+            if (item.SlotId is "FirstPrimaryWeapon" or "SecondPrimaryWeapon" or "Holster")
+            {
+                hasWeapon = true;
+                continue;
+            }
+
+            if (item.SlotId is "Backpack" or "ArmorVest" or "TacticalVest")
+            {
+                hasVestRigOrBackpack = true;
+            }
+        }
+
+        return hasWeapon && hasVestRigOrBackpack;
+    }
+
     /// <summary>
     ///     Apply Health values to profile
     /// </summary>
     /// <param name="profileToAdjust">Player profile on server</param>
     /// <param name="bodyPartChanges">Changes to apply</param>
     /// <param name="effectsToSkip"></param>
+    /// <param name="playerWasCursed">Did player enter raid with no equipment</param>
     protected void ModifyProfileHealthProperties(
         PmcData profileToAdjust,
         Dictionary<string, BodyPartHealth> bodyPartChanges,
-        HashSet<string>? effectsToSkip = null
+        HashSet<string>? effectsToSkip = null,
+        bool playerWasCursed = false
     )
     {
         foreach (var (partName, partProperties) in bodyPartChanges)
@@ -96,6 +137,12 @@ public class HealthHelper(ISptLogger<HealthHelper> logger, TimeUtil timeUtil, Co
                         : partProperties.Health.Current;
 
                 matchingProfilePart.Health.Maximum = partProperties.Health.Maximum;
+
+                // Cursed player + limb was not lost, reset to 20%
+                if (playerWasCursed && matchingProfilePart.Health.Current > 20)
+                {
+                    matchingProfilePart.Health.Current = 20;
+                }
             }
 
             // Process each effect for each part

Libraries/SPTarkov.Server.Core/Helpers/InRaidHelper.cs

@@ -179,7 +179,7 @@ public class InRaidHelper(
         }
 
         // Remove contents of fast panel
-        pmcData.Inventory.FastPanel = new Dictionary<string, MongoId>();
+        pmcData.Inventory.FastPanel = [];
     }
 
     /// <summary>

Libraries/SPTarkov.Server.Core/Models/Spt/Config/TraderConfig.cs

@@ -189,15 +189,3 @@ public record DiscountOptions
     [JsonPropertyName("equipmentPresetMinMax")]
     public required MinMax<int> EquipmentPresetMinMax { get; set; }
 }
-
-/// <summary>
-///     Custom trader data needed client side for things such as the clothing service
-/// </summary>
-public record ModdedTraders
-{
-    /// <summary>
-    ///     Trader Ids to enable the clothing service for
-    /// </summary>
-    [JsonPropertyName("clothingService")]
-    public List<string> ClothingService { get; set; } = [];
-}