From 8f7352db33dc93625bab6e4ea0c9f0fb3dd7b3b4 Mon Sep 17 00:00:00 2001 From: Zukero Date: Tue, 24 Jan 2017 12:59:38 +0100 Subject: [PATCH] Fixed an issue that prevented quickslots quantities from being updated when you loot an item that goes there. (Reapplied changes in commit missed during quickslots_custom_ui merge) --- .../AndorsTrail/controller/ItemController.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java index 4943b0066..c109536f8 100644 --- a/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java +++ b/AndorsTrail/src/com/gpl/rpg/AndorsTrail/controller/ItemController.java @@ -210,6 +210,7 @@ public final class ItemController { public void pickupAll(Loot loot) { world.model.player.inventory.add(loot.items); consumeNonItemLoot(loot); + checkQuickslotItemLooted(loot.items); loot.clear(); } public void pickupAll(Iterable lootBags) { @@ -352,4 +353,18 @@ public final class ItemController { world.model.player.inventory.quickitem[quickSlotId] = itemType; quickSlotListeners.onQuickSlotChanged(quickSlotId); } + + private void checkQuickslotItemLooted(ItemContainer items) { + for (ItemEntry item : items.items) { + if (item.itemType.isUsable()) { + for (int i = 0; i < world.model.player.inventory.quickitem.length; i++) { + if (item.itemType == world.model.player.inventory.quickitem[i]) { + quickSlotListeners.onQuickSlotChanged(i); + + } + } + } + } + } + }