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

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

Browse Source 
* Exclude items stored inside root item (e.g. armored rigs) when processing regular items

* Remove draw element when whitelist is null

* Simplify null check
This commit is contained in:
ozen-m
2025-10-20 11:23:31 +08:00
committed by GitHub
parent 9db19aa730
commit ab62b070a8
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Libraries/SPTarkov.Server.Core/Controllers/InsuranceController.cs
+1 -1
View File
@@ -402,7 +402,7 @@ public class InsuranceController(
if (parentAttachmentsMap.ContainsKey(insuredItem.Id)) if (parentAttachmentsMap.ContainsKey(insuredItem.Id))
{ {
// This call will also return the parent item itself, queueing it for deletion as well. // 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) foreach (var item in itemAndChildren)
{ {
toDelete.Add(item.Id); toDelete.Add(item.Id);
Libraries/SPTarkov.Server.Core/Utils/Collections/ProbabilityObjectArray.cs
+1 -1
View File
@@ -226,7 +226,7 @@ public class ProbabilityObjectArray<K, V> : List<ProbabilityObject<K, V>>
drawnKeys.Add(chosenItem.Key); drawnKeys.Add(chosenItem.Key);
// Only remove item if it's not in whitelist // 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 // Reduce total weight value by items weight + Remove item from pool
totalWeight -= chosenItem.Weight; totalWeight -= chosenItem.Weight;