Fixed NPE in player inventory + don't ignore the cancel state of world unloads

By: Nathan Adams <dinnerbone@dinnerbone.com>
This commit is contained in:
CraftBukkit/Spigot 2011-11-24 20:27:16 +00:00
parent 2f98915d03
commit aa9a64c1d7

View File

@ -596,7 +596,7 @@ public final class CraftServer implements Server {
}
WorldUnloadEvent e = new WorldUnloadEvent(handle.getWorld());
pluginManager.callEvent(new WorldUnloadEvent(handle.getWorld()));
pluginManager.callEvent(e);
if (e.isCancelled()) {
return false;