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

menumanager: remove click check on menumanager, causing more issues than fixing. (#1492)

Browse Source
This commit is contained in:
Ganom
2019-09-01 15:59:58 -04:00
committed by GitHub
parent cc38deb870
commit 5f3d8fcc9d
1 changed files with 6 additions and 9 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.PlayerMenuOptionsChanged;
import net.runelite.api.events.WidgetMenuOptionClicked; import net.runelite.api.events.WidgetMenuOptionClicked;
import net.runelite.api.events.WidgetPressed; import net.runelite.api.events.WidgetPressed;
import net.runelite.api.util.Text;
import net.runelite.api.widgets.WidgetInfo; import net.runelite.api.widgets.WidgetInfo;
import net.runelite.client.eventbus.EventBus; import net.runelite.client.eventbus.EventBus;
import static net.runelite.client.menus.ComparableEntries.newBaseComparableEntry; import static net.runelite.client.menus.ComparableEntries.newBaseComparableEntry;
import net.runelite.api.util.Text;
@Singleton @Singleton
@Slf4j @Slf4j
@@ -81,12 +81,12 @@ public class MenuManager
//Maps the indexes that are being used to the menu option. //Maps the indexes that are being used to the menu option.
private final Map<Integer, String> playerMenuIndexMap = new HashMap<>(); private final Map<Integer, String> playerMenuIndexMap = new HashMap<>();
//Used to manage custom non-player menu options //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 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 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 leftClickEntry = null;
private MenuEntry firstEntry = null; private MenuEntry firstEntry = null;
@@ -429,10 +429,7 @@ public class MenuManager
{ {
if (!client.isMenuOpen() && event.isAuthentic()) if (!client.isMenuOpen() && event.isAuthentic())
{ {
if (event.getMouseButton() != 0) leftClickEntry = rebuildLeftClickMenu();
{
leftClickEntry = rebuildLeftClickMenu();
}
if (leftClickEntry != null) if (leftClickEntry != null)
{ {