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

---
 ...g.patch => Use-updatingChunks-for-saving.patch} | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)
 rename patches/server/{Use-updatingChunks-for-flush-saving.patch => Use-updatingChunks-for-saving.patch} (52%)

diff --git a/patches/server/Use-updatingChunks-for-flush-saving.patch b/patches/server/Use-updatingChunks-for-saving.patch
similarity index 52%
rename from patches/server/Use-updatingChunks-for-flush-saving.patch
rename to patches/server/Use-updatingChunks-for-saving.patch
index 9017b980c9..d05ca5f8a9 100644
--- a/patches/server/Use-updatingChunks-for-flush-saving.patch
+++ b/patches/server/Use-updatingChunks-for-saving.patch
@@ -1,7 +1,7 @@
 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
+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
@@ -21,9 +21,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    // 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 = (List) this.getVisibleChunks().values().stream().filter(ChunkHolder::wasAccessibleSinceLastSave).peek(ChunkHolder::refreshAccessibility).collect(Collectors.toList()); // Paper
++            List<ChunkHolder> list = visibleChunks.values().stream().filter(ChunkHolder::wasAccessibleSinceLastSave).peek(ChunkHolder::refreshAccessibility).collect(Collectors.toList()); // Paper
              MutableBoolean mutableboolean = new MutableBoolean();
  
              do {
+@@ -0,0 +0,0 @@ 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) {