From 052d002994e64788a115e2fc465cdc7fd0e1f749 Mon Sep 17 00:00:00 2001
From: ThatGamerBlue <thatgamerblue@gmail.com>
Date: Sun, 28 Jun 2020 13:39:29 +0100
Subject: [PATCH 1/2] Revert "Revert "change scriptvm to be more reliable""

This reverts commit dbaa4d993c80b4337a69e9516242287ebe326ff3.
---
 build.gradle.kts                                            | 5 +++--
 .../java/com/openosrs/injector/injectors/raw/ScriptVM.java  | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index 69200ce..e510fab 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,10 +15,10 @@ plugins {
     id("se.patrikerdes.use-latest-versions") version "0.2.14"
 }
 
-val oprsver = "3.3.1"
+val oprsver = "3.3.8"
 
 group = "com.openosrs"
-version = "1.1.3"
+version = "1.1.4"
 
 repositories {
     mavenCentral()
@@ -26,6 +26,7 @@ repositories {
     maven {
         url = uri("https://repo.runelite.net")
         url = uri("https://raw.githubusercontent.com/open-osrs/hosting/master")
+        url = uri("https://repo.openosrs.com/repository/maven")
     }
 }
 
diff --git a/src/main/java/com/openosrs/injector/injectors/raw/ScriptVM.java b/src/main/java/com/openosrs/injector/injectors/raw/ScriptVM.java
index 309131d..1d9c463 100644
--- a/src/main/java/com/openosrs/injector/injectors/raw/ScriptVM.java
+++ b/src/main/java/com/openosrs/injector/injectors/raw/ScriptVM.java
@@ -109,12 +109,12 @@ public class ScriptVM extends AbstractInjector
 		final Field scriptInstructions = InjectUtil.findField(inject, "opcodes", "Script");
 		final Field scriptStatePC = InjectUtil.findField(inject, "pc", "ScriptFrame");
 
-		// Next 4 should be injected by mixins, so don't need fail fast
 		final ClassFile vanillaClient = vanilla.findClass("client");
 
+		// Next 4 should be injected by mixins, so don't need fail fast
 		final Method runScript = vanillaClient.findStaticMethod("copy$runScript");
 		final Method vmExecuteOpcode = vanillaClient.findStaticMethod("vmExecuteOpcode");
-		final Field currentScriptField = vanillaClient.findField("currentScript");
+		final Method setCurrentScript = vanillaClient.findStaticMethod("setCurrentScript");
 		final Field currentScriptPCField = vanillaClient.findField("currentScriptPC");
 
 		Execution e = new Execution(inject.getVanilla());
@@ -242,7 +242,7 @@ public class ScriptVM extends AbstractInjector
 					{
 						instrIter.previous();
 						instrIter.add(new Dup(instrs));
-						instrIter.add(new PutStatic(instrs, currentScriptField));
+						instrIter.add(new InvokeStatic(instrs, setCurrentScript.getPoolMethod()));
 						instrIter.next();
 					}
 				}

From 9a9833665b91a6ac10793838bb554a826d9d2d61 Mon Sep 17 00:00:00 2001
From: Lucwousin <Lucwousin@users.noreply.github.com>
Date: Sun, 28 Jun 2020 15:36:31 +0200
Subject: [PATCH 2/2] Update build.gradle.kts

---
 build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle.kts b/build.gradle.kts
index e510fab..8eaab95 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -15,7 +15,7 @@ plugins {
     id("se.patrikerdes.use-latest-versions") version "0.2.14"
 }
 
-val oprsver = "3.3.8"
+val oprsver = "3.3.1"
 
 group = "com.openosrs"
 version = "1.1.4"