mirror of
https://github.com/CivMC/Civ.git
synced 2026-07-18 00:20:44 +00:00
Merge pull request #89 from Protonull/fix-plugin-disable
Use the proper disablePlugin API
This commit is contained in:
@@ -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;
|
||||
@@ -55,10 +54,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);
|
||||
}
|
||||
|
||||
@@ -146,7 +141,7 @@ public abstract class ACivMod extends JavaPlugin {
|
||||
* Disables this plugin.
|
||||
*/
|
||||
public void disable() {
|
||||
getPluginLoader().disablePlugin(this);
|
||||
getServer().getPluginManager().disablePlugin(this);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user