diff options
author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-02-25 12:54:08 +0000 |
---|---|---|
committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-02-25 12:54:08 +0000 |
commit | a647006042bf9faa9e5ac369e21e0d4e53a54653 (patch) | |
tree | 399eb07b5d49a2e9a7fc545bc60bc6b6c6988610 /src | |
parent | bb4c973ada2802d3683b1572e768b30c1e90c025 (diff) | |
download | bukkit-a647006042bf9faa9e5ac369e21e0d4e53a54653.tar bukkit-a647006042bf9faa9e5ac369e21e0d4e53a54653.tar.gz bukkit-a647006042bf9faa9e5ac369e21e0d4e53a54653.tar.lz bukkit-a647006042bf9faa9e5ac369e21e0d4e53a54653.tar.xz bukkit-a647006042bf9faa9e5ac369e21e0d4e53a54653.zip |
onPluginEnabled after plugin is enabled + same for onPluginDisabled
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java index 6241bda6..7c9402ac 100644 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java +++ b/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<String> names = loader.getClasses(); |