From b0f41f1818de8928767fa56147e227c829b549fa Mon Sep 17 00:00:00 2001 From: Adam Date: Sat, 13 Apr 2019 13:55:26 -0400 Subject: [PATCH] clue plugin: fix emote clue overlay with no item requirements --- .../plugins/cluescrolls/clues/EmoteClue.java | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 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 e91c8c9cc9..112c5b6b68 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 @@ -28,6 +28,7 @@ import com.google.common.collect.ImmutableSet; import java.awt.Color; import java.awt.Graphics2D; import java.util.Set; +import javax.annotation.Nonnull; import lombok.Getter; import net.runelite.api.EquipmentInventorySlot; import static net.runelite.api.EquipmentInventorySlot.*; @@ -209,14 +210,15 @@ public class EmoteClue extends ClueScroll implements TextClueScroll, LocationClu private final WorldPoint location; private final Emote firstEmote; private final Emote secondEmote; + @Nonnull private final ItemRequirement[] itemRequirements; - private EmoteClue(String text, Integer stashUnit, WorldPoint location, Emote firstEmote, ItemRequirement... itemRequirements) + private EmoteClue(String text, Integer stashUnit, WorldPoint location, Emote firstEmote, @Nonnull ItemRequirement... itemRequirements) { this(text, stashUnit, location, firstEmote, null, itemRequirements); } - private EmoteClue(String text, Integer stashUnit, WorldPoint location, Emote firstEmote, Emote secondEmote, ItemRequirement... itemRequirements) + private EmoteClue(String text, Integer stashUnit, WorldPoint location, Emote firstEmote, Emote secondEmote, @Nonnull ItemRequirement... itemRequirements) { this.text = text; this.stashUnit = stashUnit; @@ -244,14 +246,7 @@ public class EmoteClue extends ClueScroll implements TextClueScroll, LocationClu .build()); } - if (getItemRequirements() == null) - { - panelComponent.getChildren().add(LineComponent.builder() - .left("Items:") - .right("None") - .build()); - } - else + if (itemRequirements.length > 0) { panelComponent.getChildren().add(LineComponent.builder().left("Equip:").build()); @@ -274,7 +269,7 @@ public class EmoteClue extends ClueScroll implements TextClueScroll, LocationClu System.arraycopy(equipment, 0, combined, 0, equipment.length); System.arraycopy(inventory, 0, combined, equipment.length, inventory.length); - for (ItemRequirement requirement : getItemRequirements()) + for (ItemRequirement requirement : itemRequirements) { boolean equipmentFulfilled = requirement.fulfilledBy(equipment); boolean combinedFulfilled = requirement.fulfilledBy(combined);