diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 7b97740c12..da8fffd47d 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -223,9 +223,9 @@ public abstract class World implements IBlockAccess {
         Chunk result = null;
         synchronized (this.chunkLock) {
             if (this.lastChunkAccessed == null || this.lastXAccessed != i || this.lastZAccessed != j) {
+                this.lastChunkAccessed = this.chunkProvider.getOrCreateChunk(i, j);
                 this.lastXAccessed = i;
                 this.lastZAccessed = j;
-                this.lastChunkAccessed = this.chunkProvider.getOrCreateChunk(i, j);
             }
             result = this.lastChunkAccessed;
         }