From c97dbc198d598f5701d0a28ca0867ee691ff326f Mon Sep 17 00:00:00 2001
From: Nathan Adams <dinnerbone@dinnerbone.com>
Date: Tue, 11 Oct 2011 04:41:34 +0100
Subject: Fixed NPE on unloading plugins

---
 src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
index 6ab27ecd..50bbdd15 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -242,7 +242,7 @@ public class JavaPluginLoader implements PluginLoader {
     public void removeClass(String name) {
         Class<?> clazz = classes.remove(name);
         
-        if (ConfigurationSerializable.class.isAssignableFrom(clazz)) {
+        if ((clazz != null) && (ConfigurationSerializable.class.isAssignableFrom(clazz))) {
             Class<? extends ConfigurationSerializable> serializable = (Class<? extends ConfigurationSerializable>)clazz;
             ConfigurationSerialization.unregisterClass(serializable);
         }
-- 
cgit v1.2.3