76 lines
2.9 KiB
Diff
76 lines
2.9 KiB
Diff
From 4d0cd6ef93096ca05ab8cb768574839fc2223abc Mon Sep 17 00:00:00 2001
|
|
From: Iceee <andrew@opticgaming.tv>
|
|
Date: Wed, 15 Jul 2015 02:41:12 -0700
|
|
Subject: [PATCH] ChunkMap caching
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
|
|
index ab4de94..d528e91 100644
|
|
--- a/src/main/java/net/minecraft/server/Chunk.java
|
|
+++ b/src/main/java/net/minecraft/server/Chunk.java
|
|
@@ -50,6 +50,29 @@ public class Chunk {
|
|
public long lightUpdateTime;
|
|
// PaperSpigot end
|
|
|
|
+ // PaperSpigot start - ChunkMap caching
|
|
+ private final Object chunkMapLock = new Object();
|
|
+ private PacketPlayOutMapChunk.ChunkMap chunkMap;
|
|
+ private boolean chunkMapDirty = true;
|
|
+
|
|
+ public void setDirty() {
|
|
+ synchronized (chunkMapLock) {
|
|
+ chunkMapDirty = true;
|
|
+ }
|
|
+ }
|
|
+
|
|
+ public PacketPlayOutMapChunk.ChunkMap getChunkMap() {
|
|
+ synchronized (chunkMapLock) {
|
|
+ if (chunkMapDirty || chunkMap == null) {
|
|
+ chunkMapDirty = false;
|
|
+ chunkMap = PacketPlayOutMapChunk.a(this, true, !world.worldProvider.o(), '\uffff');
|
|
+ }
|
|
+
|
|
+ return chunkMap;
|
|
+ }
|
|
+ }
|
|
+ // PaperSpigot end
|
|
+
|
|
// CraftBukkit start - Neighbor loaded cache for chunk lighting and entity ticking
|
|
private int neighbors = 0x1 << 12;
|
|
|
|
@@ -507,6 +530,7 @@ public class Chunk {
|
|
}
|
|
|
|
public IBlockData a(BlockPosition blockposition, IBlockData iblockdata) {
|
|
+ setDirty(); // PaperSpigot
|
|
int i = blockposition.getX() & 15;
|
|
int j = blockposition.getY();
|
|
int k = blockposition.getZ() & 15;
|
|
diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
|
|
index 58c0275..91ceb81 100644
|
|
--- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
|
|
+++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
|
|
@@ -18,7 +18,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
|
|
this.a = chunk.locX;
|
|
this.b = chunk.locZ;
|
|
this.d = flag;
|
|
- this.c = a(chunk, flag, !chunk.getWorld().worldProvider.o(), i);
|
|
+ this.c = chunk.getChunkMap(); // PaperSpigot
|
|
chunk.world.spigotConfig.antiXrayInstance.obfuscateSync(chunk.locX, chunk.locZ, c.b, c.a, chunk.world);
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
|
|
index 99473d1..5bb6ac1 100644
|
|
--- a/src/main/java/net/minecraft/server/World.java
|
|
+++ b/src/main/java/net/minecraft/server/World.java
|
|
@@ -2505,6 +2505,7 @@ public abstract class World implements IBlockAccess {
|
|
}
|
|
}
|
|
|
|
+ chunk.setDirty(); // PaperSpigot
|
|
// PaperSpigot start - Asynchronous light updates
|
|
if (chunk.world.paperSpigotConfig.useAsyncLighting) {
|
|
chunk.pendingLightUpdates.decrementAndGet();
|
|
--
|
|
1.9.5.msysgit.1
|
|
|