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

Revert "menumanager: remove click check on menumanager, it's ca… (#1515)

Browse Source 
Revert "menumanager: remove click check on menumanager, it's causing more issues than fixing."
This commit is contained in:
ST0NEWALL
2019-09-02 00:31:26 -04:00
committed by GitHub
parent 5f3d8fcc9d 222af40b39
commit 690d651c85
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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)
{