From 8acebcd7d6458ceb191e96607ed9c9cc6e37284d Mon Sep 17 00:00:00 2001
From: Tahg <tahgtahv@gmail.com>
Date: Mon, 7 Feb 2011 03:34:32 -0500
Subject: [PATCH] Fixed Chunk cache in world

---
 src/main/java/net/minecraft/server/World.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 043e4c2f01..3a24d16d7a 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -278,7 +278,7 @@ public class World implements IBlockAccess {
     int lastXAccessed = Integer.MIN_VALUE;
     int lastZAccessed = Integer.MIN_VALUE;
     public Chunk c(int i, int j) {
-        if(lastXAccessed != i || lastZAccessed != j) {
+        if(lastChunkAccessed == null || lastXAccessed != i || lastZAccessed != j) {
             lastXAccessed = i;
             lastZAccessed = j;
             lastChunkAccessed = this.G.b(i, j);
@@ -1367,7 +1367,12 @@ public class World implements IBlockAccess {
 
                 if (!this.f(k1, 64, l1)) {
                     --y;
-                } else if (!this.b(k1, l1).g()) {
+                } else {
+                    Chunk chunk = this.b(k1, l1);
+                    if(chunk == null) {
+                        System.out.println(k1 + "," + l1);
+                    }
+                    if (!chunk.g()) {
                     int i2 = this.A.size();
                     int j2;
 
@@ -1396,6 +1401,7 @@ public class World implements IBlockAccess {
 
                     --y;
                 }
+                }
             }
         }
     }