Skip to content

Fix insurance removes stored item and fix drawn element not being removed #639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 20, 2025
Merged

Fix insurance removes stored item and fix drawn element not being removed #639

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d044359
Exclude items stored inside root item (e.g. armored rigs) when proces…
ozen-m Oct 19, 2025
06b05ed
Remove draw element when whitelist is null
ozen-m Oct 19, 2025
320591c
Merge branch 'sp-tarkov:develop' into develop
ozen-m Oct 20, 2025
0ff0184
Simplify null check
ozen-m Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Libraries/SPTarkov.Server.Core/Controllers/InsuranceController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ protected void ProcessRegularItems(Insurance insured, HashSet<MongoId> toDelete,
if (parentAttachmentsMap.ContainsKey(insuredItem.Id))
{
// This call will also return the parent item itself, queueing it for deletion as well.
var itemAndChildren = insured.Items.GetItemWithChildren(insuredItem.Id);
var itemAndChildren = insured.Items.GetItemWithChildren(insuredItem.Id, true);
foreach (var item in itemAndChildren)
{
toDelete.Add(item.Id);
Expand Down
2 changes: 1 addition & 1 deletion Libraries/SPTarkov.Server.Core/Utils/Collections/ProbabilityObjectArray.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ public List<K> DrawAndRemove(int itemCountToDraw = 1, List<K>? neverRemoveWhitel
drawnKeys.Add(chosenItem.Key);

// Only remove item if it's not in whitelist
if (neverRemoveWhitelist is not null && !neverRemoveWhitelist.Contains(chosenItem.Key))
if (neverRemoveWhitelist is null || !neverRemoveWhitelist.Contains(chosenItem.Key))
{
// Reduce total weight value by items weight + Remove item from pool
totalWeight -= chosenItem.Weight;
Expand Down