diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java index ae7afb0d..fd325757 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchants.java @@ -316,7 +316,6 @@ public class EcoEnchants { for (EcoEnchant ecoEnchant : new HashSet<>(getAll())) { ecoEnchant.update(); } - EssentialsManager.registerEnchantments(); } /** diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/integrations/essentials/EssentialsManager.java b/Plugin/src/main/java/com/willfp/ecoenchants/integrations/essentials/EssentialsManager.java index 202af2dd..22bc40a9 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/integrations/essentials/EssentialsManager.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/integrations/essentials/EssentialsManager.java @@ -6,7 +6,7 @@ import java.util.Set; public class EssentialsManager { private static final Set registered = new HashSet<>(); - public static void registerAntigrief(EssentialsWrapper essentials) { + public static void registerEssentials(EssentialsWrapper essentials) { registered.add(essentials); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java b/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java index 3c7d5745..7d46f1ea 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java @@ -26,6 +26,8 @@ import com.willfp.ecoenchants.grindstone.GrindstoneListeners; import com.willfp.ecoenchants.integrations.anticheat.AnticheatManager; import com.willfp.ecoenchants.integrations.anticheat.plugins.AnticheatAAC; import com.willfp.ecoenchants.integrations.anticheat.plugins.AnticheatMatrix; +import com.willfp.ecoenchants.integrations.anticheat.plugins.AnticheatNCP; +import com.willfp.ecoenchants.integrations.anticheat.plugins.AnticheatSpartan; import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager; import com.willfp.ecoenchants.integrations.antigrief.plugins.*; import com.willfp.ecoenchants.integrations.essentials.EssentialsManager; @@ -155,7 +157,7 @@ public class Loader { } if(Bukkit.getPluginManager().isPluginEnabled("Essentials")) { - EssentialsManager.registerAntigrief(new IntegrationEssentials()); + EssentialsManager.registerEssentials(new IntegrationEssentials()); Logger.info("Essentials: §aENABLED"); } else { Logger.info("Essentials: §9DISABLED"); @@ -176,14 +178,14 @@ public class Loader { } if(Bukkit.getPluginManager().isPluginEnabled("NoCheatPlus")) { - AnticheatManager.registerAnticheat(new AnticheatAAC()); + AnticheatManager.registerAnticheat(new AnticheatNCP()); Logger.info("NCP: §aENABLED"); } else { Logger.info("NCP: §9DISABLED"); } if(Bukkit.getPluginManager().isPluginEnabled("Spartan")) { - AnticheatManager.registerAnticheat(new AnticheatAAC()); + AnticheatManager.registerAnticheat(new AnticheatSpartan()); Logger.info("Spartan: §aENABLED"); } else { Logger.info("Spartan: §9DISABLED"); @@ -313,6 +315,7 @@ public class Loader { Bukkit.getPluginManager().disablePlugin(EcoEnchantsPlugin.getInstance()); return; } else { + EssentialsManager.registerEnchantments(); Logger.info(EcoEnchants.getAll().size() + " Enchantments Loaded:"); EcoEnchants.getAll().forEach((ecoEnchant -> { if(ecoEnchant.getType().equals(EcoEnchant.EnchantmentType.SPECIAL)) {