From 6804258a1dc44b3a1db61ecb81665bc9717a8d59 Mon Sep 17 00:00:00 2001 From: Chomp Date: Sat, 14 Jun 2025 11:34:22 +0100 Subject: [PATCH] Improved nullguard inside `RemoveResourceFromArea` + changed warnings to errors --- .../SPTarkov.Server.Core/Controllers/HideoutController.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Libraries/SPTarkov.Server.Core/Controllers/HideoutController.cs b/Libraries/SPTarkov.Server.Core/Controllers/HideoutController.cs index ae54a77a..812cdfa4 100644 --- a/Libraries/SPTarkov.Server.Core/Controllers/HideoutController.cs +++ b/Libraries/SPTarkov.Server.Core/Controllers/HideoutController.cs @@ -530,10 +530,10 @@ public class HideoutController( protected ItemEventRouterResponse RemoveResourceFromArea(string sessionID, PmcData pmcData, HideoutTakeItemOutRequestData removeResourceRequest, ItemEventRouterResponse output, BotHideoutArea hideoutArea) { - var slotIndexToRemove = removeResourceRequest?.Slots.FirstOrDefault(); + var slotIndexToRemove = removeResourceRequest?.Slots?.FirstOrDefault(); if (slotIndexToRemove is null) { - _logger.Warning( + _logger.Error( $"Unable to remove resource from area: {removeResourceRequest.AreaType} slot as no slots found in request, RESTART CLIENT IMMEDIATELY" ); @@ -541,10 +541,10 @@ public class HideoutController( } // Assume only one item in slot - var itemToReturn = hideoutArea.Slots?.FirstOrDefault(slot => slot.LocationIndex == slotIndexToRemove)?.Items.FirstOrDefault(); + var itemToReturn = hideoutArea.Slots?.FirstOrDefault(slot => slot.LocationIndex == slotIndexToRemove)?.Items?.FirstOrDefault(); if (itemToReturn is null) { - _logger.Warning($"Unable to remove resource from area: {removeResourceRequest.AreaType} slot as no item found, RESTART CLIENT IMMEDIATELY"); + _logger.Error($"Unable to remove resource from area: {removeResourceRequest.AreaType} slot as no item found, RESTART CLIENT IMMEDIATELY"); return output; }