diff --git a/bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java b/bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java index e1ed0952..44bc393b 100755 --- a/bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java +++ b/bukkit/src/main/java/co/aikar/commands/BukkitCommandManager.java @@ -93,7 +93,12 @@ public class BukkitCommandManager extends CommandManager< public BukkitCommandManager(Plugin plugin) { this.plugin = plugin; - this.scheduler = new ACFBukkitScheduler(); + try { + this.scheduler = new ACFPaperScheduler(Bukkit.getAsyncScheduler()); + } catch (NoSuchMethodError e) { + // Ignored to use Bukkit Scheduler + this.scheduler = new ACFBukkitScheduler(); + } String prefix = this.plugin.getDescription().getPrefix(); this.logger = Logger.getLogger(prefix != null ? prefix : this.plugin.getName()); diff --git a/paper/src/main/java/co/aikar/commands/PaperCommandManager.java b/paper/src/main/java/co/aikar/commands/PaperCommandManager.java index a99321bc..30cb910d 100644 --- a/paper/src/main/java/co/aikar/commands/PaperCommandManager.java +++ b/paper/src/main/java/co/aikar/commands/PaperCommandManager.java @@ -45,11 +45,6 @@ public class PaperCommandManager extends BukkitCommandManager { } catch (ClassNotFoundException ignored) { // Ignored } - try { - this.scheduler = new ACFPaperScheduler(Bukkit.getAsyncScheduler()); - } catch (NoSuchMethodError e) { - // Ignored - BukkitCommandManager initializes the BukkitScheduler - } } @Override