Skip to content

Commit cac81f4

Browse files
committed
Account for compound items in DialogHelper.GetMessageItemContents
1 parent 1b07ce5 commit cac81f4

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Libraries/SPTarkov.Server.Core/Helpers/DialogueHelper.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using SPTarkov.DI.Annotations;
2+
using SPTarkov.Server.Core.Extensions;
23
using SPTarkov.Server.Core.Models.Common;
34
using SPTarkov.Server.Core.Models.Eft.Common.Tables;
45
using SPTarkov.Server.Core.Models.Eft.Profile;
@@ -67,9 +68,10 @@ public MessagePreview GetMessagePreview(Models.Eft.Profile.Dialogue? dialogue)
6768
message.Items ??= new MessageItems();
6869
message.Items.Data ??= [];
6970

70-
// Check reward count when item being moved isn't in reward list
71+
// Check reward count when item being moved (and its children) isn't in reward list
7172
// If count is 0, it means after this move occurs the reward array will be empty and all rewards collected
72-
var remainingItems = message.Items.Data.Where(x => x.Id != itemId);
73+
var itemWithChildren = message.Items.Data.GetItemWithChildren(itemId);
74+
var remainingItems = message.Items.Data.Except(itemWithChildren);
7375
if (!remainingItems.Any())
7476
{
7577
message.RewardCollected = true;

0 commit comments

Comments
 (0)