From a57954a893d58cf69607d9205b104c2762a0faa2 Mon Sep 17 00:00:00 2001 From: Jordan Atwood Date: Tue, 16 Jul 2019 22:19:34 -0700 Subject: [PATCH] npcindicators: Use "Un-tag" menu option for tagged NPCs Closes runelite/runelite#1177 --- .../client/plugins/npchighlight/NpcIndicatorsPlugin.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java index 5bb9eb357d..7ab9287cbb 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/npchighlight/NpcIndicatorsPlugin.java @@ -83,6 +83,7 @@ public class NpcIndicatorsPlugin extends Plugin // Option added to NPC menu private static final String TAG = "Tag"; + private static final String UNTAG = "Un-tag"; private static final Set NPC_MENU_ACTIONS = ImmutableSet.of(MenuAction.NPC_FIRST_OPTION, MenuAction.NPC_SECOND_OPTION, MenuAction.NPC_THIRD_OPTION, MenuAction.NPC_FOURTH_OPTION, MenuAction.NPC_FIFTH_OPTION); @@ -273,7 +274,7 @@ public class NpcIndicatorsPlugin extends Plugin MenuEntry[] menuEntries = client.getMenuEntries(); menuEntries = Arrays.copyOf(menuEntries, menuEntries.length + 1); final MenuEntry tagEntry = menuEntries[menuEntries.length - 1] = new MenuEntry(); - tagEntry.setOption(TAG); + tagEntry.setOption(highlightedNpcs.stream().anyMatch(npc -> npc.getIndex() == event.getIdentifier()) ? UNTAG : TAG); tagEntry.setTarget(event.getTarget()); tagEntry.setParam0(event.getActionParam0()); tagEntry.setParam1(event.getActionParam1()); @@ -286,7 +287,8 @@ public class NpcIndicatorsPlugin extends Plugin @Subscribe public void onMenuOptionClicked(MenuOptionClicked click) { - if (click.getMenuAction() != MenuAction.RUNELITE || !click.getMenuOption().equals(TAG)) + if (click.getMenuAction() != MenuAction.RUNELITE || + !(click.getMenuOption().equals(TAG) || click.getMenuOption().equals(UNTAG))) { return; }