From f3acdd3914c977f0c9129a8691287a87d822ee0f Mon Sep 17 00:00:00 2001 From: SmallJoker Date: Mon, 2 Sep 2019 19:30:36 +0200 Subject: [PATCH] Inventory: Handle removeItem leftovers (#8884) --- src/inventory.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/inventory.cpp b/src/inventory.cpp index 02e122416..2a7c32a44 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -680,7 +680,11 @@ ItemStack InventoryList::removeItem(const ItemStack &item) for (auto i = m_items.rbegin(); i != m_items.rend(); ++i) { if (i->name == item.name) { u32 still_to_remove = item.count - removed.count; - removed.addItem(i->takeItem(still_to_remove), m_itemdef); + ItemStack leftover = removed.addItem(i->takeItem(still_to_remove), + m_itemdef); + // Allow oversized stacks + removed.count += leftover.count; + if (removed.count == item.count) break; }