diff --git a/core/src/main/java/com/volmit/iris/util/plugin/VirtualCommand.java b/core/src/main/java/com/volmit/iris/util/plugin/VirtualCommand.java index 789c88661..bfd021efa 100644 --- a/core/src/main/java/com/volmit/iris/util/plugin/VirtualCommand.java +++ b/core/src/main/java/com/volmit/iris/util/plugin/VirtualCommand.java @@ -24,6 +24,7 @@ import com.volmit.iris.util.collection.KList; import com.volmit.iris.util.collection.KMap; import com.volmit.iris.util.format.C; import com.volmit.iris.util.reflect.V; +import com.volmit.iris.util.scheduling.J; import org.bukkit.Bukkit; import org.bukkit.Sound; import org.bukkit.command.CommandSender; @@ -171,7 +172,7 @@ public class VirtualCommand { for (String i : command.getRequiredPermissions()) { if (!sender.hasPermission(i)) { failed = true; - Bukkit.getScheduler().scheduleSyncDelayedTask(Iris.instance, () -> sender.sendMessage("- " + C.WHITE + i), 0); + J.s(() -> sender.sendMessage("- " + C.WHITE + i)); } } diff --git a/core/src/main/java/com/volmit/iris/util/scheduling/J.java b/core/src/main/java/com/volmit/iris/util/scheduling/J.java index c2e9667c8..3200737c9 100644 --- a/core/src/main/java/com/volmit/iris/util/scheduling/J.java +++ b/core/src/main/java/com/volmit/iris/util/scheduling/J.java @@ -241,18 +241,10 @@ public class J { } public static CompletableFuture sfut(Supplier r) { - CompletableFuture f = new CompletableFuture<>(); if (!Bukkit.getPluginManager().isPluginEnabled(Iris.instance)) { return null; } - Bukkit.getScheduler().scheduleSyncDelayedTask(Iris.instance, () -> { - try { - f.complete(r.get()); - } catch (Throwable e) { - f.completeExceptionally(e); - } - }); - return f; + return Iris.platform.getGlobalScheduler().run(r).getResult(); } public static CompletableFuture sfut(Runnable r, int delay) {