From c0760ce4c15a8d8ce21cbb5647983c84159b53a4 Mon Sep 17 00:00:00 2001 From: Chomp Date: Mon, 28 Apr 2025 09:43:33 +0100 Subject: [PATCH] Return empty response object when no stash id found, allows client to continue --- .../Services/CircleOfCultistService.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Libraries/SPTarkov.Server.Core/Services/CircleOfCultistService.cs b/Libraries/SPTarkov.Server.Core/Services/CircleOfCultistService.cs index baebc08c..eecc8979 100644 --- a/Libraries/SPTarkov.Server.Core/Services/CircleOfCultistService.cs +++ b/Libraries/SPTarkov.Server.Core/Services/CircleOfCultistService.cs @@ -58,11 +58,14 @@ public class CircleOfCultistService( HideoutCircleOfCultistProductionStartRequestData request ) { - var cultistCircleStashId = pmcData.Inventory.HideoutAreaStashes.GetValueOrDefault(((int)HideoutAreas.CIRCLE_OF_CULTISTS).ToString()); + var output = _eventOutputHolder.GetOutput(sessionId); + var cultistCircleStashId = pmcData.Inventory.HideoutAreaStashes.GetValueOrDefault(((int)HideoutAreas.CIRCLE_OF_CULTISTS).ToString()); if (cultistCircleStashId is null) { - _logger.Critical("Could not find cultist circle stash ID! This may result in no rewards..."); + _logger.Error("Could not find cultist circle stash ID inside inventory! No rewards generated"); + + return output; } // `cultistRecipes` just has single recipeId @@ -99,8 +102,6 @@ public class CircleOfCultistService( craftingInfo.Time ); - var output = _eventOutputHolder.GetOutput(sessionId); - // Remove sacrificed items from circle inventory foreach (var item in sacrificedItems) {