From 8746c0935496edc28e9bd9aa3a748fda793ac8c0 Mon Sep 17 00:00:00 2001 From: Adam Date: Fri, 22 Apr 2022 13:12:03 -0400 Subject: [PATCH] interact highlight: fix detecting spell attacks on npc click This was counting any widget use as an attack, when only spell use should be --- .../plugins/interacthighlight/InteractHighlightPlugin.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/interacthighlight/InteractHighlightPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/interacthighlight/InteractHighlightPlugin.java index f2a5b84e2b..fc9a71a480 100644 --- a/runelite-client/src/main/java/net/runelite/client/plugins/interacthighlight/InteractHighlightPlugin.java +++ b/runelite-client/src/main/java/net/runelite/client/plugins/interacthighlight/InteractHighlightPlugin.java @@ -43,9 +43,11 @@ import net.runelite.api.TileObject; import net.runelite.api.WallObject; import net.runelite.api.events.GameStateChanged; import net.runelite.api.events.GameTick; +import net.runelite.api.events.InteractingChanged; import net.runelite.api.events.MenuOptionClicked; import net.runelite.api.events.NpcDespawned; -import net.runelite.api.events.InteractingChanged; +import net.runelite.api.widgets.WidgetID; +import net.runelite.api.widgets.WidgetInfo; import net.runelite.client.config.ConfigManager; import net.runelite.client.eventbus.Subscribe; import net.runelite.client.plugins.Plugin; @@ -168,7 +170,8 @@ public class InteractHighlightPlugin extends Plugin int id = menuOptionClicked.getId(); interactedObject = null; interactedNpc = findNpc(id); - attacked = menuOptionClicked.getMenuAction() == MenuAction.NPC_SECOND_OPTION || menuOptionClicked.getMenuAction() == MenuAction.WIDGET_TARGET_ON_NPC; + attacked = menuOptionClicked.getMenuAction() == MenuAction.NPC_SECOND_OPTION || + menuOptionClicked.getMenuAction() == MenuAction.WIDGET_TARGET_ON_NPC && WidgetInfo.TO_GROUP(client.getSelectedWidget().getId()) == WidgetID.SPELLBOOK_GROUP_ID; clickTick = client.getTickCount(); gameCycle = client.getGameCycle(); break;