chillcog/SPT-Server-Build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved nullguard inside RemoveResourceFromArea + changed warnings to errors

Browse Source
This commit is contained in:
Chomp
2025-06-14 11:34:22 +01:00
parent 8754690748
commit 6804258a1d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/SPTarkov.Server.Core/Controllers/HideoutController.cs
+4 -4
View File
@@ -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;
}