Paper-Old/Spigot-Server-Patches/0384-Use-ChunkStatus-cache-when-saving-protochunks.patch

From bbbed5212480412ebe981d0b25cbd1ef9d4941ff Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Sat, 22 Jun 2019 04:20:47 -0700
Subject: [PATCH] Use ChunkStatus cache when saving protochunks

The cache should contain the chunk status when saving. If not it
will load it.

diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
index 57b1341b5a..5ac370720c 100644
--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
@@ -844,8 +844,10 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
                 NBTTagCompound nbttagcompound;
 
                 if (chunkstatus.getType() != ChunkStatus.Type.LEVELCHUNK) {
-                    nbttagcompound = this.readChunkData(chunkcoordintpair);
-                    if (nbttagcompound != null && ChunkRegionLoader.a(nbttagcompound) == ChunkStatus.Type.LEVELCHUNK) {
+                    // Paper start - Optimize save by using status cache
+                    ChunkStatus statusOnDisk = this.getChunkStatusOnDisk(chunkcoordintpair);
+                    if (statusOnDisk != null && statusOnDisk.getType() == ChunkStatus.Type.LEVELCHUNK) {
+                        // Paper end
                         return false;
                     }
 
-- 
2.25.1
Remove patch for MC-111480, fixed in 1.14 We were now starting entities at ID 2 2020-04-12 02:39:21 +02:00			`From bbbed5212480412ebe981d0b25cbd1ef9d4941ff Mon Sep 17 00:00:00 2001`
Optimize protochunk saving (#2218) Use a chunk status cache to check if we could potentially overwrite a levelchunk. The check could be entirely elided at the risk of overwriting chunk data, however most protochunks should have their corresponding regionfile loaded with their chunk status. 2019-06-22 22:17:40 +02:00			`From: Spottedleaf <Spottedleaf@users.noreply.github.com>`
			`Date: Sat, 22 Jun 2019 04:20:47 -0700`
			`Subject: [PATCH] Use ChunkStatus cache when saving protochunks`

			`The cache should contain the chunk status when saving. If not it`
			`will load it.`

			`diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java`
Remove patch for MC-111480, fixed in 1.14 We were now starting entities at ID 2 2020-04-12 02:39:21 +02:00			`index 57b1341b5a..5ac370720c 100644`
Optimize protochunk saving (#2218) Use a chunk status cache to check if we could potentially overwrite a levelchunk. The check could be entirely elided at the risk of overwriting chunk data, however most protochunks should have their corresponding regionfile loaded with their chunk status. 2019-06-22 22:17:40 +02:00			`--- a/src/main/java/net/minecraft/server/PlayerChunkMap.java`
			`+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java`
Fix many issues with dupe uuid resolve patch This was not applied correctly, and would completely blow up chunk entity registration if this feature was turned off.... Additionally, change how the entities are removed to be more consistent with other code. Surface some of the logs indicating there is a problem as we are having so many issues with entities that we don't need to be surpressing logs like that. 2020-03-31 08:52:12 +02:00			`@@ -844,8 +844,10 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {`
Optimize protochunk saving (#2218) Use a chunk status cache to check if we could potentially overwrite a levelchunk. The check could be entirely elided at the risk of overwriting chunk data, however most protochunks should have their corresponding regionfile loaded with their chunk status. 2019-06-22 22:17:40 +02:00			`NBTTagCompound nbttagcompound;`

			`if (chunkstatus.getType() != ChunkStatus.Type.LEVELCHUNK) {`
			`- nbttagcompound = this.readChunkData(chunkcoordintpair);`
			`- if (nbttagcompound != null && ChunkRegionLoader.a(nbttagcompound) == ChunkStatus.Type.LEVELCHUNK) {`
			`+ // Paper start - Optimize save by using status cache`
Fix loadChunk(x, z, false) I was not correctly checking if the status was even cached. Actually fix it this time Do not forget about the async chunk placeholder Actually fix it this time I hope No plugin tickets for getChunkAtGen(x, z, boolean) Change ChunkStatus ABI This is required for asynchronous IO. async io will require calls to getChunkStatusIfCached to return the chunk status for a chunk currently queued to save - this cannot be reasonably done with current ABI 2019-07-08 08:52:08 +02:00			`+ ChunkStatus statusOnDisk = this.getChunkStatusOnDisk(chunkcoordintpair);`
Optimize protochunk saving (#2218) Use a chunk status cache to check if we could potentially overwrite a levelchunk. The check could be entirely elided at the risk of overwriting chunk data, however most protochunks should have their corresponding regionfile loaded with their chunk status. 2019-06-22 22:17:40 +02:00			`+ if (statusOnDisk != null && statusOnDisk.getType() == ChunkStatus.Type.LEVELCHUNK) {`
			`+ // Paper end`
			`return false;`
			`}`

			`--`
Drop Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch This patch appears to be no longer relevant, and is seemingly a leading cause of datapack performance being horrific 2020-03-15 21:03:36 +01:00			`2.25.1`
Optimize protochunk saving (#2218) Use a chunk status cache to check if we could potentially overwrite a levelchunk. The check could be entirely elided at the risk of overwriting chunk data, however most protochunks should have their corresponding regionfile loaded with their chunk status. 2019-06-22 22:17:40 +02:00