From f0a6f4878dd3839bba69b1a1e2af1e9709016038 Mon Sep 17 00:00:00 2001
From: Jason Penilla <11360596+jpenilla@users.noreply.github.com>
Date: Wed, 16 Jun 2021 00:19:23 -0700
Subject: [PATCH] Temporarily revert incremental chunk saving patch

Needs updating to hook into new entity storage system
---
 patches/server/Buffer-joins-to-world.patch    |   4 +-
 .../server/Incremental-player-saving.patch    | 104 ------
 ...-headless-pistons-from-being-created.patch |   8 +-
 patches/server/incremental-chunk-saving.patch | 334 ------------------
 4 files changed, 5 insertions(+), 445 deletions(-)
 delete mode 100644 patches/server/Incremental-player-saving.patch
 delete mode 100644 patches/server/incremental-chunk-saving.patch

diff --git a/patches/server/Buffer-joins-to-world.patch b/patches/server/Buffer-joins-to-world.patch
index cba62468f3..2c8240a23b 100644
--- a/patches/server/Buffer-joins-to-world.patch
+++ b/patches/server/Buffer-joins-to-world.patch
@@ -12,8 +12,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -0,0 +0,0 @@ public class PaperConfig {
-             maxPlayerAutoSavePerTick = (playerAutoSaveRate == -1 || playerAutoSaveRate > 100) ? 10 : 20;
-         }
+         config.set("settings.unsupported-settings.allow-headless-pistons-readme", "This setting controls if players should be able to create headless pistons.");
+         allowHeadlessPistons = getBoolean("settings.unsupported-settings.allow-headless-pistons", false);
      }
 +
 +    public static int maxJoinsPerTick;
diff --git a/patches/server/Incremental-player-saving.patch b/patches/server/Incremental-player-saving.patch
deleted file mode 100644
index d73d11263b..0000000000
--- a/patches/server/Incremental-player-saving.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 9 Aug 2020 08:59:25 +0300
-Subject: [PATCH] Incremental player saving
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -0,0 +0,0 @@ public class PaperConfig {
-         allowPistonDuplication = getBoolean("settings.unsupported-settings.allow-piston-duplication", config.getBoolean("settings.unsupported-settings.allow-tnt-duplication", false));
-         set("settings.unsupported-settings.allow-tnt-duplication", null);
-     }
-+
-+    public static int playerAutoSaveRate = -1;
-+    public static int maxPlayerAutoSavePerTick = 10;
-+    private static void playerAutoSaveRate() {
-+        playerAutoSaveRate = getInt("settings.player-auto-save-rate", -1);
-+        maxPlayerAutoSavePerTick = getInt("settings.max-player-auto-save-per-tick", -1);
-+        if (maxPlayerAutoSavePerTick == -1) { // -1 Automatic / "Recommended"
-+            // 10 should be safe for everyone unless you mass spamming player auto save
-+            maxPlayerAutoSavePerTick = (playerAutoSaveRate == -1 || playerAutoSaveRate > 100) ? 10 : 20;
-+        }
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-         if (this.playerList != null) {
-             MinecraftServer.LOGGER.info("Saving players");
--            this.playerList.saveAll();
-             this.playerList.removeAll(this.isRestarting); // Paper
-             try { Thread.sleep(100); } catch (InterruptedException ex) {} // CraftBukkit - SPIGOT-625 - give server at least a chance to send packets
-         }
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-         // if (this.autosavePeriod > 0 && this.tickCount % this.autosavePeriod == 0) { // CraftBukkit // Paper - move down
-         //     MinecraftServer.LOGGER.debug("Autosave started"); // Paper
-         serverAutoSave = (autosavePeriod > 0 && this.tickCount % autosavePeriod == 0); // Paper
-+        // Paper start
-+        int playerSaveInterval = com.destroystokyo.paper.PaperConfig.playerAutoSaveRate;
-+        if (playerSaveInterval < 0) {
-+            playerSaveInterval = autosavePeriod;
-+        }
-+        // Paper end
-             this.profiler.push("save");
--        if (this.autosavePeriod > 0 && this.tickCount % this.autosavePeriod == 0) { // Paper - moved from above
--            this.playerList.saveAll();
-+        if (playerSaveInterval > 0) { // Paper
-+            this.playerList.savePlayers(playerSaveInterval); // Paper
-             // this.saveAllChunks(true, false, false); // Paper - saved incrementally below
-         } // Paper start
-         for (ServerLevel level : this.getAllLevels()) {
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -0,0 +0,0 @@ public class ServerPlayer extends Player {
-     public final int getViewDistance() { return this.getLevel().getChunkSource().chunkMap.viewDistance - 1; } // Paper - placeholder
- 
-     private static final Logger LOGGER = LogManager.getLogger();
-+    public long lastSave = MinecraftServer.currentTick; // Paper
-     private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_XZ = 32;
-     private static final int NEUTRAL_MOB_DEATH_NOTIFICATION_RADII_Y = 10;
-     public ServerGamePacketListenerImpl connection;
-diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/players/PlayerList.java
-+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -0,0 +0,0 @@ public abstract class PlayerList {
-     protected void save(ServerPlayer player) {
-         if (!player.getBukkitEntity().isPersistent()) return; // CraftBukkit
-         if (!player.didPlayerJoinEvent) return; // Paper - If we never fired PJE, we disconnected during login. Data has not changed, and additionally, our saved vehicle is not loaded! If we save now, we will lose our vehicle (CraftBukkit bug)
-+        player.lastSave = MinecraftServer.currentTick; // Paper
-         this.playerIo.save(player);
-         ServerStatsCounter serverstatisticmanager = (ServerStatsCounter) player.getStats(); // CraftBukkit
- 
-@@ -0,0 +0,0 @@ public abstract class PlayerList {
-     }
- 
-     public void saveAll() {
--        net.minecraft.server.MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
-+        // Paper start - incremental player saving
-+        savePlayers(null);
-+    }
-+    public void savePlayers(Integer interval) {
-+        MCUtil.ensureMain("Save Players" , () -> { // Paper - Ensure main
-         MinecraftTimings.savePlayers.startTiming(); // Paper
-+        int numSaved = 0;
-+        long now = MinecraftServer.currentTick;
-         for (int i = 0; i < this.players.size(); ++i) {
--            this.save(this.players.get(i));
-+            ServerPlayer entityplayer = this.players.get(i);
-+            if (interval == null || now - entityplayer.lastSave >= interval) {
-+                this.save(entityplayer);
-+                if (interval != null && ++numSaved <= com.destroystokyo.paper.PaperConfig.maxPlayerAutoSavePerTick) { break; }
-+            }
-+            // Paper end
-         }
-         MinecraftTimings.savePlayers.stopTiming(); // Paper
-         return null; }); // Paper - ensure main
diff --git a/patches/server/Prevent-headless-pistons-from-being-created.patch b/patches/server/Prevent-headless-pistons-from-being-created.patch
index 817ed0c1e2..24fc1b10a4 100644
--- a/patches/server/Prevent-headless-pistons-from-being-created.patch
+++ b/patches/server/Prevent-headless-pistons-from-being-created.patch
@@ -10,18 +10,16 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -0,0 +0,0 @@ public class PaperConfig {
+         allowPistonDuplication = getBoolean("settings.unsupported-settings.allow-piston-duplication", config.getBoolean("settings.unsupported-settings.allow-tnt-duplication", false));
          set("settings.unsupported-settings.allow-tnt-duplication", null);
      }
- 
++
 +    public static boolean allowHeadlessPistons;
 +    private static void allowHeadlessPistons() {
 +        config.set("settings.unsupported-settings.allow-headless-pistons-readme", "This setting controls if players should be able to create headless pistons.");
 +        allowHeadlessPistons = getBoolean("settings.unsupported-settings.allow-headless-pistons", false);
 +    }
-+
-     public static int playerAutoSaveRate = -1;
-     public static int maxPlayerAutoSavePerTick = 10;
-     private static void playerAutoSaveRate() {
+ }
 diff --git a/src/main/java/net/minecraft/world/level/Explosion.java b/src/main/java/net/minecraft/world/level/Explosion.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/net/minecraft/world/level/Explosion.java
diff --git a/patches/server/incremental-chunk-saving.patch b/patches/server/incremental-chunk-saving.patch
deleted file mode 100644
index ab856140f3..0000000000
--- a/patches/server/incremental-chunk-saving.patch
+++ /dev/null
@@ -1,334 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Sun, 9 Jun 2019 03:53:22 +0100
-Subject: [PATCH] incremental chunk saving
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -0,0 +0,0 @@ public class PaperWorldConfig {
-         log( "Keep Spawn Loaded Range: " + (keepLoadedRange/16));
-     }
- 
-+    public int autoSavePeriod = -1;
-+    private void autoSavePeriod() {
-+        autoSavePeriod = getInt("auto-save-interval", -1);
-+        if (autoSavePeriod > 0) {
-+            log("Auto Save Interval: " +autoSavePeriod + " (" + (autoSavePeriod / 20) + "s)");
-+        } else if (autoSavePeriod < 0) {
-+            autoSavePeriod = net.minecraft.server.MinecraftServer.getServer().autosavePeriod;
-+        }
-+    }
-+
-+    public int maxAutoSaveChunksPerTick = 24;
-+    private void maxAutoSaveChunksPerTick() {
-+        maxAutoSaveChunksPerTick = getInt("max-auto-save-chunks-per-tick", 24);
-+    }
-+
-     private boolean getBoolean(String path, boolean def) {
-         config.addDefault("world-settings.default." + path, def);
-         return config.getBoolean("world-settings." + worldName + "." + path, config.getBoolean("world-settings.default." + path));
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     public static int currentTick = 0; // Paper - Further improve tick loop
-     public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
-     public int autosavePeriod;
-+    public boolean serverAutoSave = false; // Paper
-     public Commands vanillaCommandDispatcher;
-     public boolean forceTicks; // Paper
-     // CraftBukkit end
-@@ -0,0 +0,0 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             this.status.getPlayers().setSample(agameprofile);
-         }
- 
--        if (this.autosavePeriod > 0 && this.tickCount % this.autosavePeriod == 0) { // CraftBukkit
--            MinecraftServer.LOGGER.debug("Autosave started");
-+        // if (this.autosavePeriod > 0 && this.tickCount % this.autosavePeriod == 0) { // CraftBukkit // Paper - move down
-+        //     MinecraftServer.LOGGER.debug("Autosave started"); // Paper
-+        serverAutoSave = (autosavePeriod > 0 && this.tickCount % autosavePeriod == 0); // Paper
-             this.profiler.push("save");
-+        if (this.autosavePeriod > 0 && this.tickCount % this.autosavePeriod == 0) { // Paper - moved from above
-             this.playerList.saveAll();
--            this.saveAllChunks(true, false, false);
--            this.profiler.pop();
--            MinecraftServer.LOGGER.debug("Autosave finished");
-+            // this.saveAllChunks(true, false, false); // Paper - saved incrementally below
-+        } // Paper start
-+        for (ServerLevel level : this.getAllLevels()) {
-+            if (level.paperConfig.autoSavePeriod > 0) {
-+                level.saveIncrementally(this.serverAutoSave);
-+            }
-         }
-+        // Paper end
-+            this.profiler.pop();
-+            // MinecraftServer.LOGGER.debug("Autosave finished"); // Paper
-+        //} // Paper
- 
-         this.profiler.push("snooper");
-         if (((DedicatedServer) this).getProperties().snooperEnabled && !this.snooper.isStarted() && this.tickCount > 100) { // Spigot
-diff --git a/src/main/java/net/minecraft/server/level/ChunkHolder.java b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/level/ChunkHolder.java
-+++ b/src/main/java/net/minecraft/server/level/ChunkHolder.java
-@@ -0,0 +0,0 @@ public class ChunkHolder {
-         this.playersInChunkTickRange = this.chunkMap.playerChunkTickRangeMap.getObjectsInRange(key);
-     }
-     // Paper end - optimise isOutsideOfRange
-+    long lastAutoSaveTime; // Paper - incremental autosave
-+    long inactiveTimeStart; // Paper - incremental autosave
- 
-     public ChunkHolder(ChunkPos pos, int level, LevelHeightAccessor world, LevelLightEngine lightingProvider, ChunkHolder.LevelChangeListener levelUpdateListener, ChunkHolder.PlayerProvider playersWatchingChunkProvider) {
-         this.futures = new AtomicReferenceArray(ChunkHolder.CHUNK_STATUSES.size());
-@@ -0,0 +0,0 @@ public class ChunkHolder {
-         boolean flag2 = playerchunk_state.isOrAfter(ChunkHolder.FullChunkStatus.BORDER);
-         boolean flag3 = playerchunk_state1.isOrAfter(ChunkHolder.FullChunkStatus.BORDER);
- 
-+        boolean prevHasBeenLoaded = this.wasAccessibleSinceLastSave; // Paper
-         this.wasAccessibleSinceLastSave |= flag3;
-+        // Paper start - incremental autosave
-+        if (this.wasAccessibleSinceLastSave & !prevHasBeenLoaded) {
-+            long timeSinceAutoSave = this.inactiveTimeStart - this.lastAutoSaveTime;
-+            if (timeSinceAutoSave < 0) {
-+                // safest bet is to assume autosave is needed here
-+                timeSinceAutoSave = this.chunkMap.level.paperConfig.autoSavePeriod;
-+            }
-+            this.lastAutoSaveTime = this.chunkMap.level.getGameTime() - timeSinceAutoSave;
-+            this.chunkMap.autoSaveQueue.add(this);
-+        }
-+        // Paper end
-         if (!flag2 && flag3) {
-             int expectCreateCount = ++this.fullChunkCreateCount; // Paper
-             this.fullChunkFuture = chunkStorage.prepareAccessibleChunk(this);
-@@ -0,0 +0,0 @@ public class ChunkHolder {
-     }
- 
-     public void refreshAccessibility() {
-+        boolean prev = this.wasAccessibleSinceLastSave; // Paper
-         this.wasAccessibleSinceLastSave = ChunkHolder.getFullChunkStatus(this.ticketLevel).isOrAfter(ChunkHolder.FullChunkStatus.BORDER);
-+        // Paper start - incremental autosave
-+        if (prev != this.wasAccessibleSinceLastSave) {
-+            if (this.wasAccessibleSinceLastSave) {
-+                long timeSinceAutoSave = this.inactiveTimeStart - this.lastAutoSaveTime;
-+                if (timeSinceAutoSave < 0) {
-+                    // safest bet is to assume autosave is needed here
-+                    timeSinceAutoSave = this.chunkMap.level.paperConfig.autoSavePeriod;
-+                }
-+                this.lastAutoSaveTime = this.chunkMap.level.getGameTime() - timeSinceAutoSave;
-+                this.chunkMap.autoSaveQueue.add(this);
-+            } else {
-+                this.inactiveTimeStart = this.chunkMap.level.getGameTime();
-+                this.chunkMap.autoSaveQueue.remove(this);
-+            }
-+        }
-+        // Paper end
-     }
- 
-+    // Paper start - incremental autosave
-+    public boolean setHasBeenLoaded() {
-+        this.wasAccessibleSinceLastSave = getFullChunkStatus(this.ticketLevel).isOrAfter(ChunkHolder.FullChunkStatus.BORDER);
-+        return this.wasAccessibleSinceLastSave;
-+    }
-+    // Paper end
-+
-     public void replaceProtoChunk(ImposterProtoChunk chunk) {
-         for (int i = 0; i < this.futures.length(); ++i) {
-             CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> completablefuture = (CompletableFuture) this.futures.get(i);
-diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/level/ChunkMap.java
-+++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -0,0 +0,0 @@ import net.minecraft.world.level.levelgen.structure.templatesystem.StructureMana
- import net.minecraft.world.level.storage.DimensionDataStorage;
- import net.minecraft.world.level.storage.LevelStorageSource;
- import net.minecraft.world.phys.Vec3;
-+import it.unimi.dsi.fastutil.objects.ObjectRBTreeSet; // Paper
- import org.apache.commons.lang3.mutable.MutableBoolean;
- import org.apache.logging.log4j.LogManager;
- import org.apache.logging.log4j.Logger;
-@@ -0,0 +0,0 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
- 
-     }
- 
-+    // Paper start - incremental autosave
-+    final ObjectRBTreeSet<ChunkHolder> autoSaveQueue = new ObjectRBTreeSet<>((playerchunk1, playerchunk2) -> {
-+        int timeCompare =  Long.compare(playerchunk1.lastAutoSaveTime, playerchunk2.lastAutoSaveTime);
-+        if (timeCompare != 0) {
-+            return timeCompare;
-+        }
-+
-+        return Long.compare(MCUtil.getCoordinateKey(playerchunk1.pos), MCUtil.getCoordinateKey(playerchunk2.pos));
-+    });
-+
-+    protected void saveIncrementally() {
-+        int savedThisTick = 0;
-+        // optimized since we search far less chunks to hit ones that need to be saved
-+        List<ChunkHolder> reschedule = new java.util.ArrayList<>(this.level.paperConfig.maxAutoSaveChunksPerTick);
-+        long currentTick = this.level.getGameTime();
-+        long maxSaveTime = currentTick - this.level.paperConfig.autoSavePeriod;
-+
-+        for (Iterator<ChunkHolder> iterator = this.autoSaveQueue.iterator(); iterator.hasNext();) {
-+            ChunkHolder playerchunk = iterator.next();
-+            if (playerchunk.lastAutoSaveTime > maxSaveTime) {
-+                break;
-+            }
-+
-+            iterator.remove();
-+
-+            ChunkAccess ichunkaccess = playerchunk.getChunkToSave().getNow(null);
-+            if (ichunkaccess instanceof LevelChunk) {
-+                boolean shouldSave = ((LevelChunk)ichunkaccess).lastSaveTime <= maxSaveTime;
-+
-+                if (shouldSave && this.save(ichunkaccess)) {
-+                    ++savedThisTick;
-+
-+                    if (!playerchunk.setHasBeenLoaded()) {
-+                        // do not fall through to reschedule logic
-+                        playerchunk.inactiveTimeStart = currentTick;
-+                        if (savedThisTick >= this.level.paperConfig.maxAutoSaveChunksPerTick) {
-+                            break;
-+                        }
-+                        continue;
-+                    }
-+                }
-+            }
-+
-+            reschedule.add(playerchunk);
-+
-+            if (savedThisTick >= this.level.paperConfig.maxAutoSaveChunksPerTick) {
-+                break;
-+            }
-+        }
-+
-+        for (int i = 0, len = reschedule.size(); i < len; ++i) {
-+            ChunkHolder playerchunk = reschedule.get(i);
-+            playerchunk.lastAutoSaveTime = this.level.getGameTime();
-+            this.autoSaveQueue.add(playerchunk);
-+        }
-+    }
-+    // Paper end
-+
-     protected void saveAllChunks(boolean flush) {
-         Long2ObjectLinkedOpenHashMap<ChunkHolder> visibleChunks = this.getVisibleChunks(); // Paper remove clone of visible Chunks unless saving off main thread (watchdog kill)
-         if (flush) {
-@@ -0,0 +0,0 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-             asyncSaveData, chunk);
- 
-         chunk.setUnsaved(false);
-+        chunk.setLastSaved(this.level.getGameTime()); // Paper - track last saved time
-     }
-     // Paper end
- 
-@@ -0,0 +0,0 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
- 
-                         this.level.unload(chunk);
-                     }
-+                    this.autoSaveQueue.remove(holder); // Paper
- 
-                     // Paper start - async chunk saving
-                     try {
-@@ -0,0 +0,0 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
-         if (!chunk.isUnsaved()) {
-             return false;
-         } else {
-+            chunk.setLastSaved(this.level.getGameTime()); // Paper - track save time
-             chunk.setUnsaved(false);
-             ChunkPos chunkcoordintpair = chunk.getPos();
- 
-diff --git a/src/main/java/net/minecraft/server/level/ServerChunkCache.java b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-+++ b/src/main/java/net/minecraft/server/level/ServerChunkCache.java
-@@ -0,0 +0,0 @@ public class ServerChunkCache extends ChunkSource {
-         } // Paper - Timings
-     }
- 
-+    // Paper start - duplicate save, but call incremental
-+    public void saveIncrementally() {
-+        this.runDistanceManagerUpdates();
-+        try (co.aikar.timings.Timing timed = level.timings.chunkSaveData.startTiming()) { // Paper - Timings
-+            this.chunkMap.saveIncrementally();
-+        } // Paper - Timings
-+    }
-+    // Paper end
-+
-     @Override
-     public void close() throws IOException {
-         // CraftBukkit start
-diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/server/level/ServerLevel.java
-+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
-@@ -0,0 +0,0 @@ public class ServerLevel extends net.minecraft.world.level.Level implements Worl
-         return !this.server.isUnderSpawnProtection(this, pos, player) && this.getWorldBorder().isWithinBounds(pos);
-     }
- 
-+    // Paper start - derived from below
-+    public void saveIncrementally(boolean doFull) {
-+        ServerChunkCache chunkproviderserver = this.getChunkSource();
-+
-+        if (doFull) {
-+            org.bukkit.Bukkit.getPluginManager().callEvent(new org.bukkit.event.world.WorldSaveEvent(getWorld()));
-+        }
-+
-+        try (co.aikar.timings.Timing ignored = this.timings.worldSave.startTiming()) {
-+            if (doFull) {
-+                this.saveLevelData();
-+            }
-+
-+            this.timings.worldSaveChunks.startTiming(); // Paper
-+            if (!this.noSave()) chunkproviderserver.saveIncrementally();
-+            this.timings.worldSaveChunks.stopTiming(); // Paper
-+
-+
-+            // Copied from save()
-+            // CraftBukkit start - moved from MinecraftServer.saveChunks
-+            if (doFull) { // Paper
-+                ServerLevel worldserver1 = this;
-+
-+                this.serverLevelData.setWorldBorder(worldserver1.getWorldBorder().createSettings());
-+                this.serverLevelData.setCustomBossEvents(this.server.getCustomBossEvents().save());
-+                this.convertable.saveDataTag(this.server.registryHolder, this.serverLevelData, this.server.getPlayerList().getSingleplayerData());
-+            }
-+            // CraftBukkit end
-+        }
-+    }
-+    // Paper end
-+
-     public void save(@Nullable ProgressListener progressListener, boolean flush, boolean flag1) {
-         ServerChunkCache chunkproviderserver = this.getChunkSource();
- 
-diff --git a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/ChunkAccess.java
-@@ -0,0 +0,0 @@ public interface ChunkAccess extends BlockGetter, FeatureAccess {
-         return GameEventDispatcher.NOOP;
-     }
- 
-+    default void setLastSaved(long ticks) {}
-     // Paper start
-     default boolean generateFlatBedrock() {
-         if (this instanceof ProtoChunk) {
-diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
---- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-+++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-@@ -0,0 +0,0 @@ public class LevelChunk implements ChunkAccess {
-     private final ShortList[] postProcessing;
-     private TickList<Block> blockTicks;
-     private TickList<Fluid> liquidTicks;
-+    // Paper start - track last save time
-+    public long lastSaveTime;
-+    @Override
-+    public void setLastSaved(long ticks) {
-+        this.lastSaveTime = ticks;
-+    }
-+    // Paper end
-     private volatile boolean unsaved;
-     private long inhabitedTime;
-     @Nullable