Azimkin/Bukkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed silly NPE during shutdown when java becomes a meanie-pants and steals our lunch money :(

Browse Source
This commit is contained in:
Nathan Adams 2011-12-09 17:13:47 +00:00
parent 3ae2ce4c30
commit a7beacd2ff
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
View File

@ -242,10 +242,15 @@ public class JavaPluginLoader implements PluginLoader {
public void removeClass(String name) { public void removeClass(String name) {
Class<?> clazz = classes.remove(name); Class<?> clazz = classes.remove(name);
try {
if ((clazz != null) && (ConfigurationSerializable.class.isAssignableFrom(clazz))) { if ((clazz != null) && (ConfigurationSerializable.class.isAssignableFrom(clazz))) {
Class<? extends ConfigurationSerializable> serializable = (Class<? extends ConfigurationSerializable>)clazz; Class<? extends ConfigurationSerializable> serializable = (Class<? extends ConfigurationSerializable>)clazz;
ConfigurationSerialization.unregisterClass(serializable); ConfigurationSerialization.unregisterClass(serializable);
} }
} catch (NullPointerException ex) {
// Boggle!
// (Native methods throwing NPEs is not fun when you can't stop it before-hand)
}
} }
public EventExecutor createExecutor(Event.Type type, Listener listener) { public EventExecutor createExecutor(Event.Type type, Listener listener) {