From 696349884b8f09430eba0c4a9847805e3e6c002c Mon Sep 17 00:00:00 2001 From: Tahg Date: Wed, 5 Oct 2011 11:31:23 -0400 Subject: don't store weak references for EmptyChunks or cache CraftBlocks --- src/main/java/net/minecraft/server/Chunk.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/main/java/net/minecraft') 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); + } } } -- cgit v1.2.3