fix(inventory): deleting skips equipped items, as the client

LWOInventoryComponent_Common::DoRemoveItemFromInventory (0x00d1fb50)
passes over equipped items when the loot source is LOOT_SOURCE_DELETION.
The server deleted the item while it was still worn.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-10-02 10:24:27 -05:00
parent 9497d20027
commit 7366799152
2 changed files with 21 additions and 0 deletions

View File

@@ -2236,6 +2236,9 @@ void InventoryComponent::OnRemoveItemFromInventory(const GameMessages::RemoveIte
const auto iStackCount = msg.iStackCount == 0 ? item->GetCount() : msg.iStackCount;
if (item->GetCount() < iStackCount) return;
// DoRemoveItemFromInventory (0x00d1fb50) skips equipped items when deleting
if (msg.eLootTypeSource == GeneralUtils::ToUnderlying(eLootSourceType::DELETION) && item->IsEquipped()) return;
if (msg.bConfirmed && !CanDelete(*item)) {
LOG("%llu tried to delete %llu (LOT %i), which its deletion restriction does not allow", m_Parent->GetObjectID(), item->GetId(), item->GetLot());
return;

View File

@@ -114,3 +114,21 @@ TEST_F(ItemRemovalTests, DeletingMoreThanTheStackHoldsDoesNothing) {
inventoryComponent->OnRemoveItemFromInventory(Delete(*other, 0));
EXPECT_EQ(other->GetCount(), 0u);
}
// LWOInventoryComponent_Common::DoRemoveItemFromInventory (0x00d1fb50) skips equipped items when deleting
TEST_F(ItemRemovalTests, AnEquippedItemIsNotDeleted) {
auto* const item = Give(1);
inventoryComponent->UpdateSlot("hair", { item->GetId(), item->GetLot(), item->GetCount(), item->GetSlot() });
ASSERT_TRUE(item->IsEquipped());
inventoryComponent->OnRemoveItemFromInventory(Delete(*item, 1));
EXPECT_EQ(item->GetCount(), 1u);
// Removed for any other reason it goes (one of a stack, so it stays equipped)
auto* const stack = Give(2);
inventoryComponent->UpdateSlot("hat", { stack->GetId(), stack->GetLot(), stack->GetCount(), stack->GetSlot() });
auto msg = Delete(*stack, 1);
msg.eLootTypeSource = GeneralUtils::ToUnderlying(eLootSourceType::NONE);
inventoryComponent->OnRemoveItemFromInventory(msg);
EXPECT_EQ(stack->GetCount(), 1u);
}