👽 Make addon compatible with Skript 2.8

Romitou · Feb 6, 2024 · 093738b · 093738b
1 parent 863159b
commit 093738b
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/build.gradle b/build.gradle
@@ -14,9 +14,9 @@ repositories {
 }
 
 dependencies {
-    implementation group: 'org.mongodb', name: 'mongodb-driver-reactivestreams', version: '4.8.2'
-    shadow group: 'io.papermc.paper', name: 'paper-api', version: '1.19.2-R0.1-SNAPSHOT'
-    shadow group: 'com.github.SkriptLang', name: 'Skript', version: '2.6.2', { // Well, the 2.6 build failed...
+    implementation group: 'org.mongodb', name: 'mongodb-driver-reactivestreams', version: '4.11.1'
+    shadow group: 'io.papermc.paper', name: 'paper-api', version: '1.20.4-R0.1-SNAPSHOT'
+    shadow group: 'com.github.SkriptLang', name: 'Skript', version: '2.8.0', {
         exclude module: 'Vault'
         exclude module: 'worldguard'
         exclude module: 'worldguard-legacy'

diff --git a/src/main/java/fr/romitou/mongosk/MongoSection.java b/src/main/java/fr/romitou/mongosk/MongoSection.java
@@ -22,7 +22,7 @@ public abstract class MongoSection<T> extends LegacyEffectSection {
     @Override
     protected void execute(Event e) {
         runSection(e);
-        Variables.setVariable(variable.getName().getDefaultVariableName(), provideValue(), e, variable.isLocal());
+        Variables.setVariable(variable.getName().toString(e), provideValue(), e, variable.isLocal());
         endSection();
     }
 

diff --git a/src/main/java/fr/romitou/mongosk/skript/sections/SectMongoDocument.java b/src/main/java/fr/romitou/mongosk/skript/sections/SectMongoDocument.java
@@ -42,7 +42,7 @@ public MongoTriggerItem(Variable<?> variable) {
 
         @Override
         protected boolean run(Event e) {
-            Variables.setVariable(variable.getName().getDefaultVariableName(), SectMongoDocument.mongoSKDocument, e, variable.isLocal());
+            Variables.setVariable(variable.getName().toString(e), SectMongoDocument.mongoSKDocument, e, variable.isLocal());
             SectMongoDocument.mongoSKDocument = new MongoSKDocument();
             return true;
         }
@@ -80,6 +80,9 @@ public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelaye
             currentSections.add(this);
             try {
                 ArrayList<TriggerItem> items = ScriptLoader.loadItems(sectionNode);
+                if (items.size() != sectionNode.size()) { // Some items didn't parse
+                    return false;
+                }
                 MongoTriggerItem mongoTriggerItem = new MongoTriggerItem(localVariable);
                 TriggerItem last = items.get(items.size() - 1).setNext(mongoTriggerItem);
                 items.set(items.size() - 1, last);