Update to 2.8 fully

SkriptLang · Jan 3, 2024 · 2c633f0 · 2c633f0
1 parent f3c7dad
commit 2c633f0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -35,6 +35,6 @@ compileJava   {
 
 dependencies {
   implementation 'org.spigotmc:spigot-api:1.13.2-R0.1-SNAPSHOT'
-  implementation 'com.github.SkriptLang:Skript:2.7.1'
+  implementation 'com.github.SkriptLang:Skript:2.8.0-pre1'
   implementation 'org.eclipse.jdt:org.eclipse.jdt.annotation:1.1.0'
 }
diff --git a/src/main/java/org/skriptlang/reflect/syntax/event/EventSyntaxInfo.java b/src/main/java/org/skriptlang/reflect/syntax/event/EventSyntaxInfo.java
@@ -1,8 +1,7 @@
 package org.skriptlang.reflect.syntax.event;
 
-import ch.njol.skript.lang.SkriptEventInfo;
-import org.skriptlang.reflect.syntax.CustomSyntaxStructure;
 import com.btk5h.skriptmirror.util.SkriptMirrorUtil;
+import org.skriptlang.reflect.syntax.CustomSyntaxStructure;
 import org.skriptlang.skript.lang.script.Script;
 
 import java.util.Objects;
@@ -14,7 +13,7 @@ protected EventSyntaxInfo(Script script, String pattern, int matchedPattern) {
   }
 
   public static EventSyntaxInfo create(Script script, String pattern, int matchedPattern) {
-    pattern = "[on] " + pattern + SkriptEventInfo.EVENT_PRIORITY_SYNTAX;
+    pattern = "[on] " + pattern;
 
     return new EventSyntaxInfo(script, SkriptMirrorUtil.preprocessPattern(pattern), matchedPattern);
   }

diff --git a/src/main/java/org/skriptlang/reflect/syntax/expression/elements/EffReturn.java b/src/main/java/org/skriptlang/reflect/syntax/expression/elements/EffReturn.java
@@ -97,7 +97,7 @@ protected TriggerItem walk(Event e) {
       if (parent instanceof SecLoop) {
         ((SecLoop) parent).exit(e);
       } else if (parent instanceof SecWhile) {
-        ((SecWhile) parent).reset();
+        ((SecWhile) parent).exit(e);
       }
       parent = parent.getParent();
     }