From 2973e1c56e52d28f259b25d685deb59fa3a3fe1f Mon Sep 17 00:00:00 2001
From: Jason <11360596+jpenilla@users.noreply.github.com>
Date: Tue, 31 Aug 2021 19:53:56 -0500
Subject: [PATCH] Always use updatingChunks for saveAllChunks (#6534)

---
 ...-Use-updatingChunks-for-flush-saving.patch | 29 --------------
 .../0802-Use-updatingChunks-for-saving.patch  | 39 +++++++++++++++++++
 2 files changed, 39 insertions(+), 29 deletions(-)
 delete mode 100644 patches/server/0802-Use-updatingChunks-for-flush-saving.patch
 create mode 100644 patches/server/0802-Use-updatingChunks-for-saving.patch

diff --git a/patches/server/0802-Use-updatingChunks-for-flush-saving.patch b/patches/server/0802-Use-updatingChunks-for-flush-saving.patch
deleted file mode 100644
index 86defd449..000000000
--- a/patches/server/0802-Use-updatingChunks-for-flush-saving.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
-Date: Tue, 31 Aug 2021 17:12:01 -0700
-Subject: [PATCH] Use updatingChunks for flush saving
-
-
-diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index d9f1601c49e7e7fc06a6f9bf0cb13aacd66f190c..59073cbae4ff8d8c38934a6d0ea11545a30a7013 100644
---- a/src/main/java/net/minecraft/server/level/ChunkMap.java
-+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -950,9 +950,17 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-     }
-     // Paper end
- 
-+    // Paper start
-+    public Long2ObjectLinkedOpenHashMap<ChunkHolder> getVisibleChunks() {
-+        synchronized (this.updatingChunks) {
-+            return this.updatingChunks.getVisibleMap().clone();
-+        }
-+    }
-+    // Paper end
-+
-     protected void saveAllChunks(boolean flush) {
-         if (flush) {
--            List<ChunkHolder> list = (List) this.visibleChunkMap.values().stream().filter(ChunkHolder::wasAccessibleSinceLastSave).peek(ChunkHolder::refreshAccessibility).collect(Collectors.toList());
-+            List<ChunkHolder> list = (List) this.getVisibleChunks().values().stream().filter(ChunkHolder::wasAccessibleSinceLastSave).peek(ChunkHolder::refreshAccessibility).collect(Collectors.toList()); // Paper
-             MutableBoolean mutableboolean = new MutableBoolean();
- 
-             do {
diff --git a/patches/server/0802-Use-updatingChunks-for-saving.patch b/patches/server/0802-Use-updatingChunks-for-saving.patch
new file mode 100644
index 000000000..a2f3e71bf
--- /dev/null
+++ b/patches/server/0802-Use-updatingChunks-for-saving.patch
@@ -0,0 +1,39 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
+Date: Tue, 31 Aug 2021 17:12:01 -0700
+Subject: [PATCH] Use updatingChunks for saving
+
+
+diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
+index d9f1601c49e7e7fc06a6f9bf0cb13aacd66f190c..730d569bd657049c8165d931ac62bf21c65a3b29 100644
+--- a/src/main/java/net/minecraft/server/level/ChunkMap.java
++++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
+@@ -950,9 +950,18 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+     }
+     // Paper end
+ 
++    // Paper start
++    public Long2ObjectLinkedOpenHashMap<ChunkHolder> getVisibleChunks() {
++        synchronized (this.updatingChunks) {
++            return this.updatingChunks.getVisibleMap().clone();
++        }
++    }
++    // Paper end
++
+     protected void saveAllChunks(boolean flush) {
++        final Long2ObjectLinkedOpenHashMap<ChunkHolder> visibleChunks = this.getVisibleChunks(); // Paper
+         if (flush) {
+-            List<ChunkHolder> list = (List) this.visibleChunkMap.values().stream().filter(ChunkHolder::wasAccessibleSinceLastSave).peek(ChunkHolder::refreshAccessibility).collect(Collectors.toList());
++            List<ChunkHolder> list = visibleChunks.values().stream().filter(ChunkHolder::wasAccessibleSinceLastSave).peek(ChunkHolder::refreshAccessibility).collect(Collectors.toList()); // Paper
+             MutableBoolean mutableboolean = new MutableBoolean();
+ 
+             do {
+@@ -983,7 +992,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+             this.level.asyncChunkTaskManager.flush(); // Paper - flush to preserve behavior compat with pre-async behaviour
+ //            this.i(); // Paper - nuke IOWorker
+         } else {
+-            this.visibleChunkMap.values().stream().filter(ChunkHolder::wasAccessibleSinceLastSave).forEach((playerchunk) -> {
++            visibleChunks.values().stream().filter(ChunkHolder::wasAccessibleSinceLastSave).forEach((playerchunk) -> { // Paper
+                 ChunkAccess ichunkaccess = (ChunkAccess) playerchunk.getChunkToSave().getNow(null); // CraftBukkit - decompile error
+ 
+                 if (ichunkaccess instanceof ImposterProtoChunk || ichunkaccess instanceof LevelChunk) {