revert EffWaitAsync

Author: rudde0

src/main/java/gg/projects/mundoskasync/EffSynchronicity.java

@@ -1,10 +1,12 @@
 package gg.projects.mundoskasync;
 
 import ch.njol.skript.Skript;
+import ch.njol.skript.effects.Delay;
 import ch.njol.skript.lang.Effect;
 import ch.njol.skript.lang.Expression;
-import ch.njol.skript.lang.SkriptParser;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.skript.lang.TriggerItem;
+import ch.njol.skript.variables.Variables;
 import ch.njol.util.Kleenean;
 import org.bukkit.event.Event;
 
@@ -17,8 +19,10 @@ public class EffSynchronicity extends Effect {
     private boolean isSync;
 
     @Override
-    public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parseResult) {
+    public boolean init(Expression<?>[] exprs, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
         isSync = matchedPattern == 1;
+
+        getParser().setHasDelayBefore(Kleenean.TRUE);
         return true;
     }
 
@@ -27,23 +31,33 @@ protected void execute(Event e) { }
 
     @Override
     public TriggerItem walk(Event e) {
-        Runnable task = () -> {
+        debug(e, true);
+
+        Object localVars = Variables.removeLocals(e);
+        Delay.addDelayedEvent(e);
+
+        Runnable runnable = () -> {
+            if (localVars != null)
+                Variables.setLocalVariables(e, localVars);
+
             TriggerItem next = getNext();
-            if (next != null) {
-                walk(next, e);
-            }
+            if (next != null)
+                walk(getNext(), e);
+
+            Variables.removeLocals(e);
         };
 
-        if (isSync) {
-            Scheduling.sync(task);
-        } else {
-            Scheduling.async(task);
-        }
+        if (isSync)
+            Scheduling.sync(runnable);
+        else
+            Scheduling.async(runnable);
+
         return null;
     }
 
     @Override
     public String toString(Event e, boolean debug) {
         return isSync ? "sync" : "async";
     }
-}
+
+}

src/main/java/gg/projects/mundoskasync/EffWaitAsync.java

@@ -9,11 +9,8 @@
 import ch.njol.skript.util.Timespan;
 import ch.njol.skript.variables.Variables;
 import ch.njol.util.Kleenean;
-import org.bukkit.Bukkit;
 import org.bukkit.event.Event;
 
-import java.util.logging.Level;
-
 public class EffWaitAsync extends Effect {
 
     static {
@@ -41,26 +38,19 @@ public TriggerItem walk(Event e) {
         Object localVars = Variables.removeLocals(e);
 
         Timespan delay = this.delay.getSingle(e);
-        if (delay == null) {
+        if (delay == null)
             return null;
-        }
 
-        Bukkit.getScheduler().runTaskLater(MundoSKAsync.getInstance(), () -> {
-            try {
-                if (localVars != null) {
-                    Variables.setLocalVariables(e, localVars);
-                }
-                TriggerItem next = getNext();
-                if (next != null) {
-                    walk(next, e);
-                }
-            } catch (Exception ex) {
-                MundoSKAsync.getInstance().getLogger().severe("Error in async wait continuation: " + ex.getMessage());
-            } finally {
-                Variables.removeLocals(e);
-            }
-        }, delay.getTicks_i());
+        Scheduling.asyncDelay((int) delay.getTicks_i(), () -> {
+            if (localVars != null)
+                Variables.setLocalVariables(e, localVars);
+
+            TriggerItem next = getNext();
+            if (next != null)
+                walk(getNext(), e);
 
+            Variables.removeLocals(e);
+        });
         return null;
     }
 

src/main/java/gg/projects/mundoskasync/Scheduling.java

@@ -3,8 +3,6 @@
 import org.bukkit.Bukkit;
 import org.bukkit.scheduler.BukkitScheduler;
 
-import java.util.logging.Level;
-
 public class Scheduling {
 
     private static final BukkitScheduler scheduler = Bukkit.getScheduler();
@@ -14,6 +12,7 @@ public static void sync(Runnable runnable) {
     }
 
     public static void async(Runnable runnable) {
+        //scheduler.runTaskAsynchronously(MundoSKAsync.getInstance(), runnable);
         TaskExecutor.executeAsync(runnable);
     }
 
@@ -24,4 +23,5 @@ public static void syncDelay(long ticks, Runnable runnable) {
     public static void asyncDelay(long ticks, Runnable runnable) {
         scheduler.runTaskLaterAsynchronously(MundoSKAsync.getInstance(), runnable, ticks);
     }
-}
+
+}