From d88a7b4f904e8ede58831795ae777ec4407c5b9a Mon Sep 17 00:00:00 2001 From: Bukkit/Spigot Date: Fri, 25 Feb 2011 12:54:08 +0000 Subject: [PATCH] onPluginEnabled after plugin is enabled + same for onPluginDisabled By: Dinnerbone --- .../main/java/org/bukkit/plugin/java/JavaPluginLoader.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/paper-api/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/paper-api/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java index 6241bda64..7c9402ac1 100644 --- a/paper-api/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/paper-api/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java @@ -421,9 +421,8 @@ public final class JavaPluginLoader implements PluginLoader { if (!plugin.isEnabled()) { JavaPlugin jPlugin = (JavaPlugin)plugin; - server.getPluginManager().callEvent(new PluginEvent(Event.Type.PLUGIN_ENABLE, plugin)); - jPlugin.setEnabled(true); + server.getPluginManager().callEvent(new PluginEvent(Event.Type.PLUGIN_ENABLE, plugin)); } } @@ -436,10 +435,10 @@ public final class JavaPluginLoader implements PluginLoader { JavaPlugin jPlugin = (JavaPlugin)plugin; ClassLoader cloader = jPlugin.getClassLoader(); - server.getPluginManager().callEvent(new PluginEvent(Event.Type.PLUGIN_DISABLE, plugin)); - jPlugin.setEnabled(false); + server.getPluginManager().callEvent(new PluginEvent(Event.Type.PLUGIN_DISABLE, plugin)); + if (cloader instanceof PluginClassLoader) { PluginClassLoader loader = (PluginClassLoader)cloader; Set names = loader.getClasses();