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

menumanager: restore force left click functionality. (#2819)

Browse Source
This commit is contained in:
Ganom
2020-10-12 13:57:55 -04:00
committed by GitHub
parent e38c3ebc61
commit 9400d1a94d
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
runelite-client/src/main/java/net/runelite/client/menus/MenuManager.java
View File

@@ -318,8 +318,14 @@ public class MenuManager
if (leftClickEntry == null) if (leftClickEntry == null)
{ {
// stop being null smh Arrays.stream(entries)
leftClickEntry = entries[menuOptionCount - 1]; .filter(Objects::nonNull)
.filter(MenuEntry::isForceLeftClick)
.findFirst()
.ifPresentOrElse(
(entry) -> leftClickEntry = entry,
() -> leftClickEntry = entries[menuOptionCount - 1]
);
} }
client.setMenuEntries(entries); client.setMenuEntries(entries);
@@ -434,7 +440,7 @@ public class MenuManager
void onMenuOptionClicked(MenuOptionClicked event) void onMenuOptionClicked(MenuOptionClicked event)
{ {
// option and target will be the same if this one came from "tempMenuAction" // option and target will be the same if this one came from "tempMenuAction"
if (!client.isMenuOpen() && !event.getOption().equals(event.getTarget()) && event.isAuthentic()) if (!client.isMenuOpen() && event.isAuthentic())
{ {
if (!event.equals(leftClickEntry)) if (!event.equals(leftClickEntry))
{ {