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

clue plugin: fix emote clue overlay with no item requirements

Browse Source
This commit is contained in:
Adam
2019-04-13 13:55:26 -04:00
parent eaac5f7b3a
commit b0f41f1818
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
runelite-client/src/main/java/net/runelite/client/plugins/cluescrolls/clues/EmoteClue.java
View File

@@ -28,6 +28,7 @@ import com.google.common.collect.ImmutableSet;
import java.awt.Color; import java.awt.Color;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.util.Set; import java.util.Set;
import javax.annotation.Nonnull;
import lombok.Getter; import lombok.Getter;
import net.runelite.api.EquipmentInventorySlot; import net.runelite.api.EquipmentInventorySlot;
import static 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 WorldPoint location;
private final Emote firstEmote; private final Emote firstEmote;
private final Emote secondEmote; private final Emote secondEmote;
@Nonnull
private final ItemRequirement[] itemRequirements; 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); 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.text = text;
this.stashUnit = stashUnit; this.stashUnit = stashUnit;
@@ -244,14 +246,7 @@ public class EmoteClue extends ClueScroll implements TextClueScroll, LocationClu
.build()); .build());
} }
if (getItemRequirements() == null) if (itemRequirements.length > 0)
{
panelComponent.getChildren().add(LineComponent.builder()
.left("Items:")
.right("None")
.build());
}
else
{ {
panelComponent.getChildren().add(LineComponent.builder().left("Equip:").build()); 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(equipment, 0, combined, 0, equipment.length);
System.arraycopy(inventory, 0, combined, equipment.length, inventory.length); System.arraycopy(inventory, 0, combined, equipment.length, inventory.length);
for (ItemRequirement requirement : getItemRequirements()) for (ItemRequirement requirement : itemRequirements)
{ {
boolean equipmentFulfilled = requirement.fulfilledBy(equipment); boolean equipmentFulfilled = requirement.fulfilledBy(equipment);
boolean combinedFulfilled = requirement.fulfilledBy(combined); boolean combinedFulfilled = requirement.fulfilledBy(combined);