From 8fa437ed62ca5a55daaccb06db2b59d2b7966b22 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Thu, 6 Sep 2018 15:19:06 -0700 Subject: [PATCH] clue scroll plugin: Check for sets across inventory and equipment Fixes runelite/runelite#3271 --- .../client/plugins/cluescrolls/clues/EmoteClue.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java index 7e0ba330ca..828356a594 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java @@ -259,16 +259,20 @@ public class EmoteClue extends ClueScroll implements TextClueScroll, LocationClu inventory = new Item[0]; } + Item[] combined = new Item[equipment.length + inventory.length]; + System.arraycopy(equipment, 0, combined, 0, equipment.length); + System.arraycopy(inventory, 0, combined, equipment.length, inventory.length); + for (ItemRequirement requirement : getItemRequirements()) { boolean equipmentFulfilled = requirement.fulfilledBy(equipment); - boolean inventoryFulfilled = requirement.fulfilledBy(inventory); + boolean combinedFulfilled = requirement.fulfilledBy(combined); panelComponent.getChildren().add(LineComponent.builder() .left(requirement.getCollectiveName(plugin.getClient())) .leftColor(TITLED_CONTENT_COLOR) - .right(equipmentFulfilled || inventoryFulfilled ? "\u2713" : "\u2717") - .rightColor(equipmentFulfilled ? Color.GREEN : (inventoryFulfilled ? Color.ORANGE : Color.RED)) + .right(combinedFulfilled ? "\u2713" : "\u2717") + .rightColor(equipmentFulfilled ? Color.GREEN : (combinedFulfilled ? Color.ORANGE : Color.RED)) .build()); } }