Paper/CraftBukkit-Patches/0015-Alternate-sync-free-but-safe-chunk-reference-cache.patch
Benjamin James Harrison-Sims 49fd03bf60 Update to 1.5.1
2013-03-20 22:13:12 +00:00

39 lines
1.5 KiB
Diff

From 1222e0b3be125bf5cabb00b3df7df8922862e27f Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
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 d78d948..9b4cc07 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -294,15 +294,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.2