Fix local variable issues with EffRunSection

Update docs

Author: TPGamesNL

docs/advanced/reflection/sections.md

@@ -28,13 +28,13 @@ the local variables from outside the section.
 {% code-tabs %}
 {% code-tabs-item title="Syntax" %}
 ```text
-run section %section% [(1¦async)] [with [arguments] %-objects%] [and store [the] result in %-objects%] [(2¦and wait)]
+run section %section% [(1¦sync|2¦async)] [with [arguments] %-objects%] [and store [the] result in %-objects%] [(2¦and wait)]
 ```
 {% endcode-tabs-item %}
 {% endcode-tabs %}
 
 This effect will run the given section.
-If you run the section async, you can choose to wait for it to be done or not, by appending `and wait` or not.
+If you run the section (a)sync, you can choose to wait for it to be done or not, by appending `and wait` or not.
 {% hint style="info" %}
 Note that you can't get output from running an async section without waiting for it to return.
 {% endhint %}

src/main/java/com/btk5h/skriptmirror/skript/reflect/sections/EffRunSection.java

@@ -67,47 +67,42 @@ else if ((parseResult.mark & 0b0010) != 0)
 
   @Override
   protected TriggerItem walk(Event e) {
-    if (!runsAsync.isUnknown()) {
-      Section section = sectionExpression.getSingle(e);
+    if (runsAsync.isUnknown())
+      return super.walk(e);
 
-      Object[][] args = getArgs(e);
+    Section section = sectionExpression.getSingle(e);
 
-      Object localVars = SkriptReflection.removeLocals(e);
+    if (section == null)
+      return getNext();
 
-      boolean ranAsync = !Bukkit.isPrimaryThread();
+    Object[][] args = getArgs(e);
 
-      if (section != null) {
-        Runnable runnable = () -> {
-          SkriptReflection.putLocals(localVars, e);
+    // Whether the trigger needs to be continued abnormally
+    boolean needsContinue = shouldWait && getNext() != null;
 
-          section.run(e, args);
-          storeResult(section, e);
+    // If the trigger needs abnormal continuation, remove locals and store whether this trigger was running async.
+    Object localVars = needsContinue ? SkriptReflection.removeLocals(e) : null;
+    boolean ranAsync = !Bukkit.isPrimaryThread();
 
+    Runnable runSection = () -> {
+      section.run(e, args);
+      storeResult(section, e);
 
-          if (shouldWait && getNext() != null) {
-            Runnable continuation = () -> {
-              TriggerItem.walk(getNext(), e);
-              SkriptReflection.removeLocals(e);
-            };
+      if (needsContinue) {
+        Runnable continuation = () -> {
+          SkriptReflection.putLocals(localVars, e);
 
-            if (ranAsync)
-              Bukkit.getScheduler().runTaskAsynchronously(SkriptMirror.getInstance(), continuation);
-            else
-              Bukkit.getScheduler().runTask(SkriptMirror.getInstance(), continuation);
-          }
+          TriggerItem.walk(getNext(), e);
+          SkriptReflection.removeLocals(e);
         };
 
-        if (runsAsync.isTrue())
-          Bukkit.getScheduler().runTaskAsynchronously(SkriptMirror.getInstance(), runnable);
-        else
-          Bukkit.getScheduler().runTask(SkriptMirror.getInstance(), runnable);
-      } else {
-        return getNext();
+        runTask(continuation, ranAsync);
       }
-      return shouldWait ? null : getNext();
-    } else {
-      return super.walk(e);
-    }
+    };
+
+    runTask(runSection, runsAsync.isTrue());
+
+    return needsContinue ? null : getNext();
   }
 
   @Override
@@ -137,4 +132,11 @@ private void storeResult(Section section, Event event) {
       variableStorage.change(event, output, Changer.ChangeMode.SET);
   }
 
+  private void runTask(Runnable task, boolean async) {
+    if (async)
+      Bukkit.getScheduler().runTaskAsynchronously(SkriptMirror.getInstance(), task);
+    else
+      Bukkit.getScheduler().runTask(SkriptMirror.getInstance(), task);
+  }
+
 }