From aa91a52f6e026d7b29c6757f5bbb6e92a0007ee8 Mon Sep 17 00:00:00 2001 From: Alexander Date: Sun, 12 Nov 2023 13:48:15 +0000 Subject: [PATCH] Use the proper disablePlugin API --- .../src/main/java/vg/civcraft/mc/civmodcore/ACivMod.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/ACivMod.java b/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/ACivMod.java index d793b180b..915beb920 100644 --- a/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/ACivMod.java +++ b/plugins/civmodcore-paper/paper/src/main/java/vg/civcraft/mc/civmodcore/ACivMod.java @@ -15,7 +15,6 @@ import org.bukkit.Bukkit; import org.bukkit.configuration.serialization.ConfigurationSerializable; import org.bukkit.configuration.serialization.ConfigurationSerialization; import org.bukkit.event.EventHandler; -import org.bukkit.event.HandlerList; import org.bukkit.event.Listener; import org.bukkit.event.server.PluginDisableEvent; import org.bukkit.plugin.Plugin; @@ -43,10 +42,6 @@ public abstract class ACivMod extends JavaPlugin { @Override public void onDisable() { - HandlerList.unregisterAll(this); - Bukkit.getMessenger().unregisterIncomingPluginChannel(this); - Bukkit.getMessenger().unregisterOutgoingPluginChannel(this); - Bukkit.getScheduler().cancelTasks(this); this.configClasses.forEach(ConfigurationSerialization::unregisterClass); } @@ -134,7 +129,7 @@ public abstract class ACivMod extends JavaPlugin { * Disables this plugin. */ public void disable() { - getPluginLoader().disablePlugin(this); + getServer().getPluginManager().disablePlugin(this); } /**