diff options
| author | Tahg <tahgtahv@gmail.com> | 2011-10-05 11:31:23 -0400 |
|---|---|---|
| committer | Tahg <tahgtahv@gmail.com> | 2011-10-05 11:36:03 -0400 |
| commit | 696349884b8f09430eba0c4a9847805e3e6c002c (patch) | |
| tree | f81a3dcb58b13dec20ddcf383e65728c71114b6f /src/main/java/net/minecraft | |
| parent | 8ab90b344c2a510fb7bc7b2bdddc2c5db995c761 (diff) | |
| download | craftbukkit-696349884b8f09430eba0c4a9847805e3e6c002c.tar craftbukkit-696349884b8f09430eba0c4a9847805e3e6c002c.tar.gz craftbukkit-696349884b8f09430eba0c4a9847805e3e6c002c.tar.lz craftbukkit-696349884b8f09430eba0c4a9847805e3e6c002c.tar.xz craftbukkit-696349884b8f09430eba0c4a9847805e3e6c002c.zip | |
don't store weak references for EmptyChunks or cache CraftBlocks
Diffstat (limited to 'src/main/java/net/minecraft')
| -rw-r--r-- | src/main/java/net/minecraft/server/Chunk.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java index 939fa69f..82955f65 100644 --- a/src/main/java/net/minecraft/server/Chunk.java +++ b/src/main/java/net/minecraft/server/Chunk.java @@ -56,10 +56,12 @@ public class Chunk { Arrays.fill(this.c, -999); // CraftBukkit start - org.bukkit.craftbukkit.CraftWorld cworld = this.world.getWorld(); - this.bukkitChunk = (cworld == null) ? null : cworld.popPreservedChunk(i, j); - if (this.bukkitChunk == null) { - this.bukkitChunk = new org.bukkit.craftbukkit.CraftChunk(this); + if (!(this instanceof EmptyChunk)) { + org.bukkit.craftbukkit.CraftWorld cworld = this.world.getWorld(); + this.bukkitChunk = (cworld == null) ? null : cworld.popPreservedChunk(i, j); + if (this.bukkitChunk == null) { + this.bukkitChunk = new org.bukkit.craftbukkit.CraftChunk(this); + } } } |