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

null guards

Browse Source
This commit is contained in:
CWX
2025-01-23 22:32:28 +00:00
parent 43b38e3dcd
commit 78cd8dace0
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/Core/Services/LocationLifecycleService.cs
+10 -4
View File
@@ -383,7 +383,7 @@ public class LocationLifecycleService
var serverDetails = request.ServerId.Split("."); var serverDetails = request.ServerId.Split(".");
var locationName = serverDetails[0].ToLower(); var locationName = serverDetails[0].ToLower();
var isPmc = serverDetails[1].ToLower() == "pmc"; var isPmc = serverDetails[1].ToLower().Contains("pmc");
var mapBase = _databaseService.GetLocation(locationName).Base; var mapBase = _databaseService.GetLocation(locationName).Base;
var isDead = IsPlayerDead(request.Results); var isDead = IsPlayerDead(request.Results);
var isTransfer = IsMapToMapTransfer(request.Results); var isTransfer = IsMapToMapTransfer(request.Results);
@@ -949,11 +949,17 @@ public class LocationLifecycleService
foreach (var trasferType in transferTypes) { foreach (var trasferType in transferTypes) {
var rootId = $"{Traders.BTR}_{trasferType}"; var rootId = $"{Traders.BTR}_{trasferType}";
var itemsToSend = request?.TransferItems?[rootId] ?? []; List<Item>? itemsToSend = null;
// if rootId doesnt exist in TransferItems, skip
if (!request?.TransferItems?.TryGetValue(rootId, out itemsToSend) ?? false)
{
continue;
}
// Filter out the btr container item from transferred items before delivering // Filter out the btr container item from transferred items before delivering
itemsToSend = itemsToSend.Where(item => item.Id != Traders.BTR).ToList(); itemsToSend = itemsToSend?.Where(item => item.Id != Traders.BTR).ToList();
if (itemsToSend.Count == 0) { if (itemsToSend?.Count == 0) {
continue; continue;
} }