Menumanager: fixes (#1261)

* menumanager: 'remove' hidden entries on added

* menumanager: keep original index in mind when prio1 == prio2
This commit is contained in:
Lucwousin
2019-08-05 16:11:02 +02:00
committed by GitHub
parent 82d15803b3
commit c6542541b2
5 changed files with 123 additions and 93 deletions

View File

@@ -682,6 +682,11 @@ public abstract class RSClientMixin implements RSClient
for (MenuEntry entry : entries)
{
if (entry == null)
{
continue;
}
menuOptions[count] = entry.getOption();
menuTargets[count] = entry.getTarget();
menuIdentifiers[count] = entry.getIdentifier();
@@ -1385,8 +1390,9 @@ public abstract class RSClientMixin implements RSClient
@Inject
@MethodHook("openMenu")
public void menuOpened(int var1, int var2)
public void menuOpened(int x, int y)
{
sortMenuEntries();
final MenuOpened event = new MenuOpened();
event.setMenuEntries(getMenuEntries());
callbacks.post(MenuOpened.class, event);