ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2026-02-21 15:27:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

fix bugs

Browse source
This commit is contained in:
Soreepeong 2023-12-01 22:02:08 +09:00
parent 35f4ff5c94
commit f8dff15fe0
1 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Dalamud/Game/Inventory/GameInventory.cs
View file

@ -22,7 +22,7 @@ namespace Dalamud.Game.Inventory;
[ServiceManager.BlockingEarlyLoadedService] [ServiceManager.BlockingEarlyLoadedService]
internal class GameInventory : IDisposable, IServiceType, IGameInventory internal class GameInventory : IDisposable, IServiceType, IGameInventory
{ {
private static readonly ModuleLog Log = new("GameInventory"); private static readonly ModuleLog Log = new(nameof(GameInventory));
private readonly List<InventoryItemAddedArgs> addedEvents = new(); private readonly List<InventoryItemAddedArgs> addedEvents = new();
private readonly List<InventoryItemRemovedArgs> removedEvents = new(); private readonly List<InventoryItemRemovedArgs> removedEvents = new();
@ -195,20 +195,23 @@ internal class GameInventory : IDisposable, IServiceType, IGameInventory
for (var j = i - 1; j >= 0; --j) for (var j = i - 1; j >= 0; --j)
{ {
var e2 = this.changedEvents[j]; var e2 = this.changedEvents[j];
if (e1.Item.ItemId != e2.Item.ItemId || e1.Item.ItemId != e2.Item.ItemId) if (e1.Item.ItemId != e2.OldItemState.ItemId || e1.OldItemState.ItemId != e2.Item.ItemId)
continue; continue;
// move happened, and e2 has an item // Move happened, and e2 has an item.
if (!e2.Item.IsEmpty) if (!e2.Item.IsEmpty)
this.movedEvents.Add(new(e1, e2)); this.movedEvents.Add(new(e1, e2));
// move happened, and e1 has an item // Move happened, and e1 has an item.
if (!e1.Item.IsEmpty) if (!e1.Item.IsEmpty)
this.movedEvents.Add(new(e2, e1)); this.movedEvents.Add(new(e2, e1));
// Remove the reinterpreted entries. Note that i > j. // Remove the reinterpreted entries. Note that i > j.
this.changedEvents.RemoveAt(i); this.changedEvents.RemoveAt(i);
this.changedEvents.RemoveAt(j); this.changedEvents.RemoveAt(j);
// We've removed two. Adjust the outer counter.
--i;
break; break;
} }
} }