From 222af40b3911b94053d1131c2961d45739cf1769 Mon Sep 17 00:00:00 2001
From: Ganom <theariall@gmail.com>
Date: Sun, 1 Sep 2019 19:43:01 -0400
Subject: [PATCH] Revert "menumanager: remove click check on menumanager,
 causing more issues than fixing. (#1492)"

This reverts commit 5f3d8fcc9d98c46af66c81704bdef53c4ab73d24.
---
 .../net/runelite/client/menus/MenuManager.java    | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 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 490fcad0a2..ef1c5e3720 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
@@ -60,10 +60,10 @@ import net.runelite.api.events.PlayerMenuOptionClicked;
 import net.runelite.api.events.PlayerMenuOptionsChanged;
 import net.runelite.api.events.WidgetMenuOptionClicked;
 import net.runelite.api.events.WidgetPressed;
-import net.runelite.api.util.Text;
 import net.runelite.api.widgets.WidgetInfo;
 import net.runelite.client.eventbus.EventBus;
 import static net.runelite.client.menus.ComparableEntries.newBaseComparableEntry;
+import net.runelite.api.util.Text;
 
 @Singleton
 @Slf4j
@@ -81,12 +81,12 @@ public class MenuManager
 	//Maps the indexes that are being used to the menu option.
 	private final Map<Integer, String> playerMenuIndexMap = new HashMap<>();
 	//Used to manage custom non-player menu options
-	private final Map<AbstractComparableEntry, AbstractComparableEntry> swaps = new HashMap<>();
-	private final Map<MenuEntry, AbstractComparableEntry> currentPriorityEntries = new LinkedHashMap<>();
 	private final Multimap<Integer, WidgetMenuOption> managedMenuOptions = HashMultimap.create();
-	private final Set<AbstractComparableEntry> hiddenEntries = new HashSet<>();
-	private final Set<AbstractComparableEntry> priorityEntries = new HashSet<>();
 	private final Set<String> npcMenuOptions = new HashSet<>();
+	private final HashSet<AbstractComparableEntry> priorityEntries = new HashSet<>();
+	private LinkedHashMap<MenuEntry, AbstractComparableEntry> currentPriorityEntries = new LinkedHashMap<>();
+	private final HashSet<AbstractComparableEntry> hiddenEntries = new HashSet<>();
+	private final HashMap<AbstractComparableEntry, AbstractComparableEntry> swaps = new HashMap<>();
 
 	private MenuEntry leftClickEntry = null;
 	private MenuEntry firstEntry = null;
@@ -429,7 +429,10 @@ public class MenuManager
 	{
 		if (!client.isMenuOpen() && event.isAuthentic())
 		{
-			leftClickEntry = rebuildLeftClickMenu();
+			if (event.getMouseButton() != 0)
+			{
+				leftClickEntry = rebuildLeftClickMenu();
+			}
 
 			if (leftClickEntry != null)
 			{