Merge remote-tracking branch 'runelite/master' into 0908-merge

2019-08-11 02:20:12 +02:00
parent b94f810962 bbbac4ac4d
commit 8a8ece3c7a
24 changed files with 203 additions and 174 deletions
--- a/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/ScriptVMMixin.java
@@ -142,12 +142,12 @@ public abstract class ScriptVMMixin implements RSClient

 	@Inject
 	@Override
-	public void runScript(int id, Object... args)
+	public void runScript(Object... args)
 	{
 		assert isClientThread();
 		assert currentScript == null;
 		Object[] cargs = new Object[args.length + 1];
-		cargs[0] = id;
+		// cargs[0] = id;
 		System.arraycopy(args, 0, cargs, 1, args.length);
 		RSScriptEvent se = createScriptEvent();
 		se.setArguments(cargs);