42 lines
1.7 KiB
Diff
42 lines
1.7 KiB
Diff
From e95aac5349ba7dac025251bc1c0c006dbfbfd010 Mon Sep 17 00:00:00 2001
|
|
From: Mike Primm <mike@primmhome.com>
|
|
Date: Wed, 16 Jan 2013 15:27:22 -0600
|
|
Subject: [PATCH] Sync Free Chunk Reference Cache
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
|
index 146285f..5ea860f 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -292,20 +292,18 @@ public abstract class World implements IBlockAccess {
|
|
return this.getChunkAt(i >> 4, j >> 4);
|
|
}
|
|
|
|
+ // Spigot start
|
|
public Chunk getChunkAt(int i, int j) {
|
|
- // CraftBukkit start
|
|
- 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.locX != i || result.locZ != j) {
|
|
+ result = this.chunkProvider.getOrCreateChunk(i, j);
|
|
+ this.lastChunkAccessed = result; // Exploit fact that write is atomic
|
|
}
|
|
+ //}
|
|
return result;
|
|
- // CraftBukkit end
|
|
}
|
|
+ // Spigot end
|
|
|
|
public boolean setTypeAndData(int i, int j, int k, Block block, int l, int i1) {
|
|
if (i >= -30000000 && k >= -30000000 && i < 30000000 && k < 30000000) {
|
|
--
|
|
1.8.3.2
|
|
|