Skip to content

Fix FurniListAddOrUpdate #2

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

Open
QDaves wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix FurniListAddOrUpdate #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 13 additions & 10 deletions src/Xabbo.Core/Game/Inventory/InventoryManager.Handlers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,17 +82,20 @@ private void HandleInventoryItemAddedOrUpdated(InventoryItemAddedOrUpdatedMsg ms
{
if (_inventory is not { } inventory) return;

inventory.AddOrUpdate(msg.Item, out bool added);

if (added)
foreach (var item in msg.Items)
{
_logger.LogDebug("Added inventory item #{ItemId}.", msg.Item.ItemId);
ItemAdded?.Invoke(new InventoryItemEventArgs(msg.Item));
}
else
{
_logger.LogDebug("Updated inventory item #{ItemId}.", msg.Item.ItemId);
ItemUpdated?.Invoke(new InventoryItemEventArgs(msg.Item));
inventory.AddOrUpdate(item, out bool added);

if (added)
{
_logger.LogDebug("Added inventory item #{ItemId}.", item.ItemId);
ItemAdded?.Invoke(new InventoryItemEventArgs(item));
}
else
{
_logger.LogDebug("Updated inventory item #{ItemId}.", item.ItemId);
ItemUpdated?.Invoke(new InventoryItemEventArgs(item));
}
}
}

Expand Down
8 changes: 4 additions & 4 deletions src/Xabbo.Core/Messages/Incoming/InventoryItemAddedOrUpdatedMsg.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ namespace Xabbo.Core.Messages.Incoming;
/// <item>Flash: <see cref="In.FurniListAddOrUpdate"/></item>
/// </list>
/// </summary>
/// <param name="Item">The item that was added or updated.</param>
public sealed record InventoryItemAddedOrUpdatedMsg(InventoryItem Item)
/// <param name="Items">The items that were added or updated.</param>
public sealed record InventoryItemAddedOrUpdatedMsg(InventoryItem[] Items)
: IMessage<InventoryItemAddedOrUpdatedMsg>
{
static ClientType IMessage<InventoryItemAddedOrUpdatedMsg>.SupportedClients => ClientType.Modern;
static Identifier IMessage<InventoryItemAddedOrUpdatedMsg>.Identifier => In.FurniListAddOrUpdate;
static InventoryItemAddedOrUpdatedMsg IParser<InventoryItemAddedOrUpdatedMsg>.Parse(in PacketReader p) => new(p.Parse<InventoryItem>());
void IComposer.Compose(in PacketWriter p) => p.Compose(Item);
static InventoryItemAddedOrUpdatedMsg IParser<InventoryItemAddedOrUpdatedMsg>.Parse(in PacketReader p) => new(p.ParseArray<InventoryItem>());
void IComposer.Compose(in PacketWriter p) => p.ComposeArray(Items);
}