From 255ce8ed9171a1a862549e173cd85ac138a17fe7 Mon Sep 17 00:00:00 2001 From: Tomas Slusny Date: Wed, 26 Sep 2018 09:22:45 +0200 Subject: [PATCH] Move clue inventory/equipment assignment to ItemContainerChanged Signed-off-by: Tomas Slusny --- .../plugins/cluescrolls/ClueScrollPlugin.java | 45 +++++++------------ 1 file changed, 16 insertions(+), 29 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java index ab757cbc9a..1fc51ccb47 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java @@ -46,7 +46,6 @@ import net.runelite.api.GameState; import net.runelite.api.InventoryID; import net.runelite.api.Item; import net.runelite.api.ItemComposition; -import net.runelite.api.ItemContainer; import net.runelite.api.ItemID; import net.runelite.api.NPC; import net.runelite.api.Scene; @@ -167,6 +166,8 @@ public class ClueScrollPlugin extends Plugin overlayManager.remove(clueScrollEmoteOverlay); overlayManager.remove(clueScrollWorldOverlay); npcsToMark.clear(); + inventoryItems = null; + equippedItems = null; resetClue(true); } @@ -213,8 +214,21 @@ public class ClueScrollPlugin extends Plugin @Subscribe public void onItemContainerChanged(final ItemContainerChanged event) { + if (event.getItemContainer() == client.getItemContainer(InventoryID.EQUIPMENT)) + { + equippedItems = event.getItemContainer().getItems(); + return; + } + + if (event.getItemContainer() != client.getItemContainer(InventoryID.INVENTORY)) + { + return; + } + + inventoryItems = event.getItemContainer().getItems(); + // Check if item was removed from inventory - if (clue != null && clueItemId != null && event.getItemContainer() == client.getItemContainer(InventoryID.INVENTORY)) + if (clue != null && clueItemId != null) { final Stream items = Arrays.stream(event.getItemContainer().getItems()); @@ -341,33 +355,6 @@ public class ClueScrollPlugin extends Plugin } } - if (clue instanceof EmoteClue) - { - ItemContainer equipment = client.getItemContainer(InventoryID.EQUIPMENT); - - if (equipment != null) - { - equippedItems = equipment.getItems(); - } - - ItemContainer inventory = client.getItemContainer(InventoryID.INVENTORY); - - if (inventory != null) - { - inventoryItems = inventory.getItems(); - } - } - - if (clue instanceof CoordinateClue || clue instanceof FairyRingClue) - { - ItemContainer container = client.getItemContainer(InventoryID.INVENTORY); - - if (container != null) - { - inventoryItems = container.getItems(); - } - } - ClueScroll clue = findClueScroll(); if (clue == null && this.clue != null)