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

This commit is contained in:
Ganom
2020-10-12 13:57:55 -04:00
committed by GitHub
parent e38c3ebc61
commit 9400d1a94d

View File

@@ -318,8 +318,14 @@ public class MenuManager
if (leftClickEntry == null)
{
// stop being null smh
leftClickEntry = entries[menuOptionCount - 1];
Arrays.stream(entries)
.filter(Objects::nonNull)
.filter(MenuEntry::isForceLeftClick)
.findFirst()
.ifPresentOrElse(
(entry) -> leftClickEntry = entry,
() -> leftClickEntry = entries[menuOptionCount - 1]
);
}
client.setMenuEntries(entries);
@@ -434,7 +440,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.getOption().equals(event.getTarget()) && event.isAuthentic())
if (!client.isMenuOpen() && event.isAuthentic())
{
if (!event.equals(leftClickEntry))
{