ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Move clue inventory/equipment assignment to ItemContainerChanged

Browse Source 
Signed-off-by: Tomas Slusny <slusnucky@gmail.com>
This commit is contained in:
Tomas Slusny
2018-09-26 09:22:45 +02:00
parent 19bd40f7bb
commit 255ce8ed91
1 changed files with 16 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/ClueScrollPlugin.java
View File

@@ -46,7 +46,6 @@ import net.runelite.api.GameState;
import net.runelite.api.InventoryID; import net.runelite.api.InventoryID;
import net.runelite.api.Item; import net.runelite.api.Item;
import net.runelite.api.ItemComposition; import net.runelite.api.ItemComposition;
import net.runelite.api.ItemContainer;
import net.runelite.api.ItemID; import net.runelite.api.ItemID;
import net.runelite.api.NPC; import net.runelite.api.NPC;
import net.runelite.api.Scene; import net.runelite.api.Scene;
@@ -167,6 +166,8 @@ public class ClueScrollPlugin extends Plugin
overlayManager.remove(clueScrollEmoteOverlay); overlayManager.remove(clueScrollEmoteOverlay);
overlayManager.remove(clueScrollWorldOverlay); overlayManager.remove(clueScrollWorldOverlay);
npcsToMark.clear(); npcsToMark.clear();
inventoryItems = null;
equippedItems = null;
resetClue(true); resetClue(true);
} }
@@ -213,8 +214,21 @@ public class ClueScrollPlugin extends Plugin
@Subscribe @Subscribe
public void onItemContainerChanged(final ItemContainerChanged event) 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 // 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<Item> items = Arrays.stream(event.getItemContainer().getItems()); final Stream<Item> 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(); ClueScroll clue = findClueScroll();
if (clue == null && this.clue != null) if (clue == null && this.clue != null)