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

Harden AddTaskItemRequirementsToRewardPool against NullReferenceExceptions (#729)

Browse Source 
* Sanitize AddTaskItemRequirementsToRewardPool

* add log

---------

Co-authored-by: rootdarkarchon <root.darkarchon@outlook.com>
This commit is contained in:
rootdarkarchon
2026-01-15 20:56:05 +01:00
committed by GitHub
parent d8881d1329
commit b12c7ddbd0
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/SPTarkov.Server.Core/Services/CircleOfCultistService.cs
+10 -5
View File
@@ -683,14 +683,19 @@ public class CircleOfCultistService(
/// <param name="rewardPool">Pool to add items to</param> /// <param name="rewardPool">Pool to add items to</param>
protected void AddTaskItemRequirementsToRewardPool(PmcData pmcData, HashSet<MongoId> itemRewardBlacklist, HashSet<MongoId> rewardPool) protected void AddTaskItemRequirementsToRewardPool(PmcData pmcData, HashSet<MongoId> itemRewardBlacklist, HashSet<MongoId> rewardPool)
{ {
var activeTasks = pmcData.Quests.Where(quest => quest.Status == QuestStatusEnum.Started); var activeTasks = pmcData.Quests?.Where(quest => quest.Status == QuestStatusEnum.Started);
foreach (var task in activeTasks) foreach (var task in activeTasks ?? [])
{ {
var questData = questHelper.GetQuestFromDb(task.QId, pmcData); var questData = questHelper.GetQuestFromDb(task.QId, pmcData);
var handoverConditions = questData.Conditions.AvailableForFinish.Where(condition => condition.ConditionType == "HandoverItem"); if (questData is null)
foreach (var condition in handoverConditions)
{ {
foreach (var neededItem in condition.Target.List) logger.Warning($"Could not get quest data for QId {task.QId}.");
continue;
}
var handoverConditions = questData.Conditions.AvailableForFinish?.Where(condition => condition.ConditionType == "HandoverItem");
foreach (var condition in handoverConditions ?? [])
{
foreach (var neededItem in condition?.Target?.List ?? [])
{ {
if (itemRewardBlacklist.Contains(neededItem) || !itemHelper.IsValidItem(neededItem)) if (itemRewardBlacklist.Contains(neededItem) || !itemHelper.IsValidItem(neededItem))
{ {