From 5986a3c78a9582513cba49f90b8bd0487d1494b6 Mon Sep 17 00:00:00 2001 From: therealnull Date: Tue, 13 Oct 2020 15:35:09 -0400 Subject: [PATCH] Revert "menumanager: restore force left click functionality. (#2819)" This reverts commit 9400d1a94daf57b0f1a3f79e8ebd99e1434ee201. --- .../java/net/runelite/client/menus/MenuManager.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) 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 899161bfce..2a96a24d76 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 @@ -318,14 +318,8 @@ public class MenuManager if (leftClickEntry == null) { - Arrays.stream(entries) - .filter(Objects::nonNull) - .filter(MenuEntry::isForceLeftClick) - .findFirst() - .ifPresentOrElse( - (entry) -> leftClickEntry = entry, - () -> leftClickEntry = entries[menuOptionCount - 1] - ); + // stop being null smh + leftClickEntry = entries[menuOptionCount - 1]; } client.setMenuEntries(entries); @@ -440,7 +434,7 @@ public class MenuManager void onMenuOptionClicked(MenuOptionClicked event) { // option and target will be the same if this one came from "tempMenuAction" - if (!client.isMenuOpen() && event.isAuthentic()) + if (!client.isMenuOpen() && !event.getOption().equals(event.getTarget()) && event.isAuthentic()) { if (!event.equals(leftClickEntry)) {