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

project(bs-things): Checkstylee

Browse Source
This commit is contained in:
Owain van Brakel
2022-04-20 23:31:41 +02:00
parent eadc31db1b
commit ca07234036
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
runelite-mixins/src/main/java/net/runelite/mixins/RSClientMixin.java
View File

@@ -1051,7 +1051,8 @@ public abstract class RSClientMixin implements RSClient
for (int i = optionCount; i < tmpOptionsCount; ++i) for (int i = optionCount; i < tmpOptionsCount; ++i)
{ {
RSRuneLiteMenuEntry entry = rl$menuEntries[i]; RSRuneLiteMenuEntry entry = rl$menuEntries[i];
if (entry == null) { if (entry == null)
{
rl$logger.error("about to crash: opcnt:{} tmpopcnt:{} i:{}", optionCount, tmpOptionsCount, i); rl$logger.error("about to crash: opcnt:{} tmpopcnt:{} i:{}", optionCount, tmpOptionsCount, i);
} }
rl$menuEntries[i].setConsumer(null); rl$menuEntries[i].setConsumer(null);
@@ -1691,7 +1692,8 @@ public abstract class RSClientMixin implements RSClient
&& client.getMenuArguments2()[i] == param1 && client.getMenuArguments2()[i] == param1
&& option.equals(client.getMenuOptions()[i]) && option.equals(client.getMenuOptions()[i])
&& (option.equals(target) || target.equals(client.getMenuTargets()[i])) && (option.equals(target) || target.equals(client.getMenuTargets()[i]))
) { )
{
menuEntry = rl$menuEntries[i]; menuEntry = rl$menuEntries[i];
break; break;
} }
@@ -1718,7 +1720,8 @@ public abstract class RSClientMixin implements RSClient
client.getMenuArguments2()[i] = param1; client.getMenuArguments2()[i] = param1;
client.getMenuForceLeftClick()[i] = false; client.getMenuForceLeftClick()[i] = false;
menuEntry = rl$menuEntries[i]; menuEntry = rl$menuEntries[i];
if (menuEntry == null) { if (menuEntry == null)
{
menuEntry = rl$menuEntries[i] = newRuneliteMenuEntry(i); menuEntry = rl$menuEntries[i] = newRuneliteMenuEntry(i);
} }
} }
@@ -1743,9 +1746,12 @@ public abstract class RSClientMixin implements RSClient
if (menuEntry.getConsumer() != null) if (menuEntry.getConsumer() != null)
{ {
try { try
{
menuEntry.getConsumer().accept(menuEntry); menuEntry.getConsumer().accept(menuEntry);
} catch (Exception ex) { }
catch (Exception ex)
{
client.getLogger().warn("exception in menu callback", ex); client.getLogger().warn("exception in menu callback", ex);
} }
} }
@@ -1785,9 +1791,11 @@ public abstract class RSClientMixin implements RSClient
} }
} }
if (opcode == MenuAction.WIDGET_CONTINUE.getId()) { if (opcode == MenuAction.WIDGET_CONTINUE.getId())
{
Widget widget = client.getWidget(param1); Widget widget = client.getWidget(param1);
if (widget == null || param0 > -1 && widget.getChild(param0) == null) { if (widget == null || param0 > -1 && widget.getChild(param0) == null)
{
return; return;
} }
} }