[ci skip] Move some disruptive patches back

2024-01-23 12:06:27 +01:00
parent 5dec86e71c
commit e433c8696b
16 changed files with 55 additions and 87 deletions
--- a/patches/server/incremental-chunk-and-player-saving.patch
+++ b/patches/server/incremental-chunk-and-player-saving.patch
@@ -34,7 +34,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +        int playerSaveInterval = io.papermc.paper.configuration.GlobalConfiguration.get().playerAutoSave.rate;
 +        if (playerSaveInterval < 0) {
 +            playerSaveInterval = autosavePeriod;
-+        }
+         }
 +        this.profiler.push("save");
 +        final boolean fullSave = autosavePeriod > 0 && this.tickCount % autosavePeriod == 0;
 +        try {
@@ -49,7 +49,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +            }
 +        } finally {
 +            this.isSaving = false;
-         }
+        }
 +        this.profiler.pop();
 +        // Paper end - Incremental chunk and player saving
         io.papermc.paper.util.CachedLists.reset(); // Paper