From aa8483ea7e4d75f51f19d91175ee1b2d483eede3 Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Wed, 26 Jun 2019 15:21:16 +0100 Subject: [PATCH] Only save world data during a full save (Fixes #2243) --- .../0399-incremental-chunk-saving.patch | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/Spigot-Server-Patches/0399-incremental-chunk-saving.patch b/Spigot-Server-Patches/0399-incremental-chunk-saving.patch index 677232c933..aa3b442757 100644 --- a/Spigot-Server-Patches/0399-incremental-chunk-saving.patch +++ b/Spigot-Server-Patches/0399-incremental-chunk-saving.patch @@ -1,4 +1,4 @@ -From 2cc99dff418c4fe9f531d9ebdfba29b78b30dcb8 Mon Sep 17 00:00:00 2001 +From 454f8b5f99337406d4fbea161d48624e6f4dcb5f Mon Sep 17 00:00:00 2001 From: Shane Freeder Date: Sun, 9 Jun 2019 03:53:22 +0100 Subject: [PATCH] incremental chunk saving @@ -126,7 +126,7 @@ index d85220b66c..c4ad039ffd 100644 } diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java -index 2e697675e2..ec3b6ec5cf 100644 +index 2e697675e2..ccc129525a 100644 --- a/src/main/java/net/minecraft/server/WorldServer.java +++ b/src/main/java/net/minecraft/server/WorldServer.java @@ -755,8 +755,9 @@ public class WorldServer extends World { @@ -148,6 +148,22 @@ index 2e697675e2..ec3b6ec5cf 100644 timings.worldSaveChunks.startTiming(); // Paper chunkproviderserver.save(flag); +@@ -772,6 +774,7 @@ public class WorldServer extends World { + } // Paper + } + ++ if (flag || server.serverAutoSave) { // Paper + // CraftBukkit start - moved from MinecraftServer.saveChunks + // PAIL - rename + WorldServer worldserver1 = this; +@@ -781,6 +784,7 @@ public class WorldServer extends World { + worlddata.c(this.server.getBossBattleCustomData().c()); + worldserver1.getDataManager().saveWorldData(worlddata, this.server.getPlayerList().r()); + // CraftBukkit end ++ } // Paper + } + + protected void k_() throws ExceptionWorldConflict { -- 2.22.0