Skip to content
Open
Changes from all commits
Commits
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
18 changes: 13 additions & 5 deletions source/GameInterface/Services/Inventory/Handlers/TradeHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ private void Handle_TradeAttempted(MessagePayload<TradeAttempted> payload)

if (what.CanGainXpFromDiscarding)
{
soldItems = ResolveLeftLootIds(what.FromRoster._data);
soldItems = ResolveLeftLootIds(what.FromRoster);
}

var characterIdEquipmentsData = ResolveCharacterIdEquipmentsData(what.OwnerParty, what.InitialCharacterEquipment);
Expand Down Expand Up @@ -231,6 +231,9 @@ private void Handle_UpdateEquipmentClients(MessagePayload<UpdateEquipmentClients

foreach (var (item, count) in items)
{
if (item.EquipmentElement.Item == null)
Comment thread
jordanbrymora marked this conversation as resolved.
Comment thread
jordanbrymora marked this conversation as resolved.
continue;

if (TryResolveItemRosterId(item, out var resolvedItem))
{
resolvedItems.Add((resolvedItem, count));
Expand All @@ -240,15 +243,20 @@ private void Handle_UpdateEquipmentClients(MessagePayload<UpdateEquipmentClients
return resolvedItems.ToArray();
}

private (ItemRosterElementData, int)[] ResolveLeftLootIds(ItemRosterElement[] items)
private (ItemRosterElementData, int)[] ResolveLeftLootIds(ItemRoster discardedItems)
{
var resolvedItems = new List<(ItemRosterElementData, int)>();

for (int i = 0; i < items.Length; i++)
for (int i = 0; i < discardedItems.Count; i++)
{
if (TryResolveItemRosterId(items[i], out var resolvedItem))
var item = discardedItems.GetElementCopyAtIndex(i);

if (item.EquipmentElement.Item == null)
continue;

if (TryResolveItemRosterId(item, out var resolvedItem))
{
resolvedItems.Add((resolvedItem, items[i].Amount));
resolvedItems.Add((resolvedItem, item.Amount));
}
}

Expand Down
Loading