diff options
| author | Nathan Adams <dinnerbone@dinnerbone.com> | 2011-10-11 04:41:34 +0100 |
|---|---|---|
| committer | Nathan Adams <dinnerbone@dinnerbone.com> | 2011-10-11 04:41:34 +0100 |
| commit | c97dbc198d598f5701d0a28ca0867ee691ff326f (patch) | |
| tree | 4c063d5454cd92ab915021cdc524109f3340f5bd | |
| parent | 537840d1dfc7dbb5ca9401ee78d80881cda8e210 (diff) | |
| download | bukkit-c97dbc198d598f5701d0a28ca0867ee691ff326f.tar bukkit-c97dbc198d598f5701d0a28ca0867ee691ff326f.tar.gz bukkit-c97dbc198d598f5701d0a28ca0867ee691ff326f.tar.lz bukkit-c97dbc198d598f5701d0a28ca0867ee691ff326f.tar.xz bukkit-c97dbc198d598f5701d0a28ca0867ee691ff326f.zip | |
Fixed NPE on unloading plugins
| -rw-r--r-- | src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java | 2 |
1 files changed, 1 insertions, 1 deletions
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); } |