From 3b1fe146746b93011b0a7bab56281160f6461cd1 Mon Sep 17 00:00:00 2001 From: Mike Primm Date: Wed, 16 Jan 2013 15:27:22 -0600 Subject: [PATCH] Alternate, sync-free-but-safe chunk reference cache --- src/main/java/net/minecraft/server/World.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java index 1e36467..e2426bc 100644 --- a/src/main/java/net/minecraft/server/World.java +++ b/src/main/java/net/minecraft/server/World.java @@ -297,15 +297,13 @@ public abstract class World implements IBlockAccess { // CraftBukkit start public Chunk getChunkAt(int i, int j) { - 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; - } - result = this.lastChunkAccessed; + //synchronized (this.chunkLock) { + Chunk result = this.lastChunkAccessed; // Exploit fact that read is atomic + if (result == null || result.x != i || result.z != j) { + result = this.chunkProvider.getOrCreateChunk(i, j); + this.lastChunkAccessed = result; // Exploit fact that write is atomic } + //} return result; } // CraftBukkit end -- 1.8.1-rc2