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

Merge pull request #2332 from Owain94/merge-1102

Browse Source 
project: Merge upstream
This commit is contained in:
Owain van Brakel
2020-02-11 20:09:28 +01:00
committed by GitHub
parent 5b1ecd43c5 491a7e76c4
commit fa10880673
14 changed files with 320 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,6 +29,8 @@ import java.util.regex.Pattern;
import net.runelite.api.Client;
import static net.runelite.api.Opcodes.RUNELITE_EXECUTE;
import net.runelite.api.events.ScriptCallbackEvent;
import net.runelite.api.events.ScriptPostFired;
import net.runelite.api.events.ScriptPreFired;
import net.runelite.api.mixins.Copy;
import net.runelite.api.mixins.Inject;
import net.runelite.api.mixins.Mixin;
@@ -131,7 +133,20 @@ public abstract class ScriptVMMixin implements RSClient
try
{
if (event.getArguments() != null && event.getArguments().length > 0)
{
ScriptPreFired scriptPreFired = new ScriptPreFired((Integer) event.getArguments()[0]);
scriptPreFired.setScriptEvent(event);
client.getCallbacks().post(ScriptPreFired.class, scriptPreFired);
}
rs$runScript(event, maxExecutionTime);
if (event.getArguments() != null && event.getArguments().length > 0)
{
ScriptPostFired scriptPostFired = new ScriptPostFired((Integer) event.getArguments()[0]);
client.getCallbacks().post(ScriptPostFired.class, scriptPostFired);
}
}
finally
{