From c9caa8c770bbce284a1ff1c21b9c87061e2a74b0 Mon Sep 17 00:00:00 2001
From: Prototik <me@prok.pw>
Date: Thu, 22 Oct 2015 01:33:46 +0700
Subject: [PATCH] Fix #210

---
 patches/net/minecraft/world/gen/ChunkProviderServer.java.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/patches/net/minecraft/world/gen/ChunkProviderServer.java.patch b/patches/net/minecraft/world/gen/ChunkProviderServer.java.patch
index f4b1663..be417f9 100644
--- a/patches/net/minecraft/world/gen/ChunkProviderServer.java.patch
+++ b/patches/net/minecraft/world/gen/ChunkProviderServer.java.patch
@@ -250,7 +250,7 @@
 +        Chunk chunk = (Chunk) this.loadedChunkHashMap_KC.get(LongHash.toLong(p_73154_1_, p_73154_2_));
 +        chunk = chunk == null ? (shouldLoadChunk() ? this.loadChunk(p_73154_1_, p_73154_2_) : this.defaultEmptyChunk) : chunk; // Cauldron handle forge server tick events and load the chunk within 5 seconds of the world being loaded (for chunk loaders)
 +
-+        if (chunk == this.defaultEmptyChunk)
++        if (chunk == this.defaultEmptyChunk || chunk == null)
 +        {
 +            return chunk;
 +        }