diff --git a/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/BukkitCompatibilityManager.java b/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/BukkitCompatibilityManager.java index a341e41fe..636924df9 100644 --- a/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/BukkitCompatibilityManager.java +++ b/bukkit/compatibility/src/main/java/net/momirealms/craftengine/bukkit/compatibility/BukkitCompatibilityManager.java @@ -39,8 +39,6 @@ public class BukkitCompatibilityManager implements CompatibilityManager { private final Map modelProviders; private final Map levelerProviders; private boolean hasPlaceholderAPI; - private boolean hasViaVersion; - private MythicSkillHelper skillExecute; public BukkitCompatibilityManager(BukkitCraftEngine plugin) { this.plugin = plugin; @@ -63,33 +61,13 @@ public class BukkitCompatibilityManager implements CompatibilityManager { this.hasPlaceholderAPI = true; logHook("PlaceholderAPI"); } - // skript if (this.isPluginEnabled("Skript")) { SkriptHook.register(); logHook("Skript"); - Plugin skriptPlugin = getPlugin("Skript"); - // This can cause bugs, needs to find a better way -// for (BukkitTask task : Bukkit.getScheduler().getPendingTasks()) { -// if (task.getOwner() == skriptPlugin) { -// task.cancel(); -// if (VersionHelper.isFolia()) { -// Bukkit.getGlobalRegionScheduler().run(skriptPlugin, (t) -> { -// FastNMS.INSTANCE.getBukkitTaskRunnable(task).run(); -// }); -// } else { -// Bukkit.getScheduler().runTask(skriptPlugin, FastNMS.INSTANCE.getBukkitTaskRunnable(task)); -// } -// } -// } } // WorldEdit if (this.isPluginEnabled("FastAsyncWorldEdit")) { - try { - this.initFastAsyncWorldEditHook(); - logHook("FastAsyncWorldEdit"); - } catch (Exception e) { - this.plugin.logger().warn("[Compatibility] Failed to initialize FastAsyncWorldEdit hook", e); - } + // do nothing } else if (this.isPluginEnabled("WorldEdit")) { this.initWorldEditHook(); logHook("WorldEdit"); @@ -136,6 +114,15 @@ public class BukkitCompatibilityManager implements CompatibilityManager { new MythicItemDropListener(this.plugin); logHook("MythicMobs"); } + // FastAsyncWorldEdit + if (this.isPluginEnabled("FastAsyncWorldEdit")) { + try { + this.initFastAsyncWorldEditHook(); + logHook("FastAsyncWorldEdit"); + } catch (Exception e) { + this.plugin.logger().warn("[Compatibility] Failed to initialize FastAsyncWorldEdit hook", e); + } + } } @Override