Properly clean up the plugin ref in the manager.

Bukkit · Feb 25, 2011 · 702b596 · 702b596
1 parent f5d0e03
commit 702b596
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
@@ -197,10 +197,12 @@ public void enableAllPlugins() {
      * {@inheritDoc}
      */
     public void disablePlugin(final Plugin plugin) {
-        callEvent(new PluginEvent(Event.Type.PLUGIN_DISABLE, plugin));
+        PluginDescription description = plugin.getDescription();
 
-        plugin.getDescription().getLoader().disablePlugin(plugin);
+        callEvent(new PluginEvent(Event.Type.PLUGIN_DISABLE, plugin));
 
+        description.getLoader().disablePlugin(plugin);
+        plugins.remove(description.getName());
         clearEvents(plugin);
         commandMap.clearCommands(plugin);
         server.getScheduler().cancelTasks(plugin);