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

scriptvm: Fix cast exception

Browse Source
This commit is contained in:
Owain van Brakel
2020-02-11 23:56:41 +01:00
parent 2d2590e64d
commit b523003d0f
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java
View File

@@ -139,6 +139,15 @@ public abstract class ScriptVMMixin implements RSClient
return false; return false;
} }
boolean tryParseInt(String value) {
try {
Integer.parseInt(value);
return true;
} catch (NumberFormatException e) {
return false;
}
}
@Copy("runScript") @Copy("runScript")
static void rs$runScript(RSScriptEvent event, int maxExecutionTime) static void rs$runScript(RSScriptEvent event, int maxExecutionTime)
{ {
@@ -171,11 +180,15 @@ public abstract class ScriptVMMixin implements RSClient
{ {
try try
{ {
scriptIds.push((Integer) event.getArguments()[0]); // this is safe because it will always be the script id try
{
scriptIds.push((Integer) event.getArguments()[0]); // this is safe because it will always be the script id
ScriptPreFired preFired = new ScriptPreFired(scriptIds.peek()); // peek doesn't remove the top item ScriptPreFired preFired = new ScriptPreFired(scriptIds.peek()); // peek doesn't remove the top item
preFired.setScriptEvent(event); preFired.setScriptEvent(event);
client.getCallbacks().post(ScriptPreFired.class, preFired); client.getCallbacks().post(ScriptPreFired.class, preFired);
}
catch (ClassCastException ignored) {}
rs$runScript(event, maxExecutionTime); rs$runScript(event, maxExecutionTime);