From 74bf22ad52fa7f1622e477b53bc4440306e55575 Mon Sep 17 00:00:00 2001
From: kickash32 <kickash32@gmail.com>
Date: Sat, 27 Jun 2020 21:19:04 -0400
Subject: [PATCH] more patch organization
0383 was merged into async chunk io patch.
0316 might still be needed but its unlikely.
---
...Status-cache-when-saving-protochunks.patch | 25 -------------------
.../0302-Avoid-dimension-id-collisions.patch | 0
.../0316-Fix-MC-93764.patch | 0
...x-some-generation-concurrency-issues.patch | 0
4 files changed, 25 deletions(-)
delete mode 100644 removed/1.16/0383-Use-ChunkStatus-cache-when-saving-protochunks.patch
rename removed/1.16/{ => No longer Needed}/0302-Avoid-dimension-id-collisions.patch (100%)
rename removed/1.16/{ => No longer Needed}/0316-Fix-MC-93764.patch (100%)
rename removed/1.16/{ => No longer Needed}/0373-Fix-some-generation-concurrency-issues.patch (100%)
diff --git a/removed/1.16/0383-Use-ChunkStatus-cache-when-saving-protochunks.patch b/removed/1.16/0383-Use-ChunkStatus-cache-when-saving-protochunks.patch
deleted file mode 100644
index f94c70b4c..000000000
--- a/removed/1.16/0383-Use-ChunkStatus-cache-when-saving-protochunks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 0000000000000000000000000000000000000000 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 1d517fd1aea90edf470388fd857a41f2be149327..9171785ad54a26e95dea8b30509c1e49a5d9b22d 100644
---- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
-+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -845,8 +845,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;
- }
-
diff --git a/removed/1.16/0302-Avoid-dimension-id-collisions.patch b/removed/1.16/No longer Needed/0302-Avoid-dimension-id-collisions.patch
similarity index 100%
rename from removed/1.16/0302-Avoid-dimension-id-collisions.patch
rename to removed/1.16/No longer Needed/0302-Avoid-dimension-id-collisions.patch
diff --git a/removed/1.16/0316-Fix-MC-93764.patch b/removed/1.16/No longer Needed/0316-Fix-MC-93764.patch
similarity index 100%
rename from removed/1.16/0316-Fix-MC-93764.patch
rename to removed/1.16/No longer Needed/0316-Fix-MC-93764.patch
diff --git a/removed/1.16/0373-Fix-some-generation-concurrency-issues.patch b/removed/1.16/No longer Needed/0373-Fix-some-generation-concurrency-issues.patch
similarity index 100%
rename from removed/1.16/0373-Fix-some-generation-concurrency-issues.patch
rename to removed/1.16/No longer Needed/0373-Fix-some-generation-concurrency-issues.patch