From c6632af7bf2c21cac0e9e02a5c12d4bff85f589f Mon Sep 17 00:00:00 2001 From: Max Weber Date: Mon, 26 Aug 2019 18:46:28 -0600 Subject: [PATCH] runelite-client: Don't add our menu options in spell casting/target mode --- .../src/main/java/net/runelite/client/menus/MenuManager.java | 5 +++++ .../java/net/runelite/client/ui/overlay/OverlayRenderer.java | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java index 955c3ef0e5..863e58ea10 100644 --- a/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java +++ b/runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java @@ -117,6 +117,11 @@ public class MenuManager @Subscribe public void onMenuEntryAdded(MenuEntryAdded event) { + if (client.getSpellSelected()) + { + return; + } + int widgetId = event.getActionParam1(); Collection options = managedMenuOptions.get(widgetId); diff --git a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java index e0810cef00..81b405fe83 100644 --- a/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java +++ b/runelite-client/src/main/java/net/runelite/client/ui/overlay/OverlayRenderer.java @@ -304,7 +304,7 @@ public class OverlayRenderer extends MouseAdapter implements KeyListener graphics.setColor(previous); } - if (menuEntries == null && !client.isMenuOpen() && bounds.contains(mouse)) + if (menuEntries == null && !client.isMenuOpen() && !client.getSpellSelected() && bounds.contains(mouse)) { menuEntries = createRightClickMenuEntries(overlay); }