Remove legacy Chunk cache. Fixes BUKKIT-1400

2 files changed, 6 insertions, 9 deletions

diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
index 9aa52174..5835eef9 100644
--- a/src/main/java/net/minecraft/server/Chunk.java
+++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -7,8 +7,11 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
-import org.bukkit.Bukkit; // CraftBukkit
-import org.bukkit.craftbukkit.util.UnsafeList; // CraftBukkit
+
+// CraftBukkit start
+import org.bukkit.Bukkit;
+import org.bukkit.craftbukkit.util.UnsafeList;
+// CraftBukkit end
 
 public class Chunk {
 
@@ -62,11 +65,7 @@ public class Chunk {
 
         // CraftBukkit start
         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);
-            }
+            this.bukkitChunk = new org.bukkit.craftbukkit.CraftChunk(this);
         }
     }
 
diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
index bc21b8a0..60f7f91d 100644
--- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
+++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -241,8 +241,6 @@ public class ChunkProviderServer implements IChunkProvider {
                 ChunkUnloadEvent event = new ChunkUnloadEvent(chunk.bukkitChunk);
                 server.getPluginManager().callEvent(event);
                 if (!event.isCancelled()) {
-                    this.world.getWorld().preserveChunk((CraftChunk) chunk.bukkitChunk);
-
                     chunk.removeEntities();
                     this.saveChunk(chunk);
                     this.saveChunkNOP(chunk);