diff options
| author | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-01-04 21:13:59 +0000 |
|---|---|---|
| committer | Dinnerbone <dinnerbone@dinnerbone.com> | 2011-01-04 21:13:59 +0000 |
| commit | 4a9c761707fbdaeacadac3cb894aeff8a231e365 (patch) | |
| tree | 2b614344b869e0b857523806fa8a9cffa22d1257 /src/main/java/net | |
| parent | ca765c351298073e7084f7b2f47cadda1fce01d4 (diff) | |
| download | craftbukkit-4a9c761707fbdaeacadac3cb894aeff8a231e365.tar craftbukkit-4a9c761707fbdaeacadac3cb894aeff8a231e365.tar.gz craftbukkit-4a9c761707fbdaeacadac3cb894aeff8a231e365.tar.lz craftbukkit-4a9c761707fbdaeacadac3cb894aeff8a231e365.tar.xz craftbukkit-4a9c761707fbdaeacadac3cb894aeff8a231e365.zip | |
Fixed random NPE on startup
Diffstat (limited to 'src/main/java/net')
| -rw-r--r-- | src/main/java/net/minecraft/server/WorldServer.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java index 8936121f..da6b8dd4 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -75,10 +75,12 @@ public class WorldServer extends World { if (block != null) { // CraftBukkit start - BlockPhysicsEvent event = new BlockPhysicsEvent(Event.Type.BLOCK_PHYSICS, world.getBlockAt(i1, j1, k1), l1); - server.getPluginManager().callEvent(event); - if (event.isCancelled()) { - return; + if (world != null) { + BlockPhysicsEvent event = new BlockPhysicsEvent(Event.Type.BLOCK_PHYSICS, world.getBlockAt(i1, j1, k1), l1); + server.getPluginManager().callEvent(event); + if (event.isCancelled()) { + return; + } } // CraftBukkit stop |