diff options
| author | VictorD <victor.danell@gmail.com> | 2011-02-20 23:22:28 +0100 |
|---|---|---|
| committer | VictorD <victor.danell@gmail.com> | 2011-02-20 23:22:28 +0100 |
| commit | bf9a55049e6be249856d07b1bda99552b0f902f7 (patch) | |
| tree | 86f93e2b9bdf6dac7403fbd5edba065bdc36aa45 /src/main/java/net/minecraft/server/Chunk.java | |
| parent | cec04a7360ef0baf7dfdc3cc2af2be02c54403c9 (diff) | |
| download | craftbukkit-bf9a55049e6be249856d07b1bda99552b0f902f7.tar craftbukkit-bf9a55049e6be249856d07b1bda99552b0f902f7.tar.gz craftbukkit-bf9a55049e6be249856d07b1bda99552b0f902f7.tar.lz craftbukkit-bf9a55049e6be249856d07b1bda99552b0f902f7.tar.xz craftbukkit-bf9a55049e6be249856d07b1bda99552b0f902f7.zip | |
Second part of NPE and arctan update :3
Diffstat (limited to 'src/main/java/net/minecraft/server/Chunk.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/Chunk.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java index 592e3408..ef81adf9 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -6,6 +6,8 @@ import java.util.List; import java.util.Map; import java.util.Random; +import org.bukkit.craftbukkit.CraftWorld; + public class Chunk { public static boolean a; @@ -44,7 +46,8 @@ public class Chunk { } // CraftBukkit start - bukkitChunk = ((WorldServer) world).getWorld().popPreservedChunk( i, j ); + CraftWorld cw = ((WorldServer) world).getWorld(); + bukkitChunk = (cw == null) ? null:cw.popPreservedChunk( i, j ); if (bukkitChunk == null) { bukkitChunk = new org.bukkit.craftbukkit.CraftChunk( this ); } |