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

Merge pull request #1298 from Owain94/scripts

Browse Source 
client/api: fix runscript
This commit is contained in:
Owain van Brakel
2019-08-11 19:52:08 +02:00
committed by GitHub
parent ca608069d1 02cf62b881
commit 5a63dea300
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
runelite-api/src/main/java/net/runelite/api/ScriptID.java
View File

@@ -147,15 +147,6 @@ public final class ScriptID
@ScriptArguments(integer = 2) @ScriptArguments(integer = 2)
public static final int DIARY_QUEST_UPDATE_LINECOUNT = 2523; public static final int DIARY_QUEST_UPDATE_LINECOUNT = 2523;
/**
* Initializes the chatbox input to use RuneLite callbacks
* <ul>
* <li> String Prompt text </li>
* <li> String Default value </li>
* </ul>
*/
public static final int RUNELITE_CHATBOX_INPUT_INIT = 10001;
/** /**
* Handles zoom input * Handles zoom input
* *
@@ -197,15 +188,18 @@ public final class ScriptID
/** /**
* Join a clan, duh * Join a clan, duh
*/ */
@ScriptArguments(string = 1)
public static final int CUSTOM_JOIN_CLAN = 10690; public static final int CUSTOM_JOIN_CLAN = 10690;
/** /**
* Send a public message * Send a public message
*/ */
@ScriptArguments(string = 1)
public static final int PUBLICMSG = 13337; public static final int PUBLICMSG = 13337;
/** /**
* Clicking bank pin buttons runs this * Clicking bank pin buttons runs this
*/ */
@ScriptArguments(integer = 20)
public static final int BANK_PIN_OP = 685; public static final int BANK_PIN_OP = 685;
} }

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

@@ -146,11 +146,9 @@ public abstract class ScriptVMMixin implements RSClient
{ {
assert isClientThread(); assert isClientThread();
assert currentScript == null; assert currentScript == null;
Object[] cargs = new Object[args.length]; assert args[0] instanceof Integer || args[0] instanceof JavaScriptCallback : "The first argument should always be a ScriptID!";
assert cargs[0] instanceof Integer || cargs[0] instanceof JavaScriptCallback : "The first argument should always be a ScriptID!";
System.arraycopy(args, 0, cargs, 1, args.length);
RSScriptEvent se = createScriptEvent(); RSScriptEvent se = createScriptEvent();
se.setArguments(cargs); se.setArguments(args);
runScript(se, 5000000); runScript(se, 5000000);
} }
} }