From baf28f8babfea38d17e2854d1cba88d202023309 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Wed, 26 Jun 2019 15:21:16 +0100
Subject: [PATCH] Only save world data during a full save (Fixes #2243)

---
 .../incremental-chunk-saving.patch             | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/Spigot-Server-Patches/incremental-chunk-saving.patch b/Spigot-Server-Patches/incremental-chunk-saving.patch
index 9c9c6e5125..d0e663719f 100644
--- a/Spigot-Server-Patches/incremental-chunk-saving.patch
+++ b/Spigot-Server-Patches/incremental-chunk-saving.patch
@@ -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
 @@ -0,0 +0,0 @@ public class WorldServer extends World {
@@ -148,4 +148,20 @@ index 2e697675e2..ec3b6ec5cf 100644
  
              timings.worldSaveChunks.startTiming(); // Paper
              chunkproviderserver.save(flag);
+@@ -0,0 +0,0 @@ public class WorldServer extends World {
+             } // Paper
+         }
+ 
++        if (flag || server.serverAutoSave) { // Paper
+         // CraftBukkit start - moved from MinecraftServer.saveChunks
+         // PAIL - rename
+         WorldServer worldserver1 = this;
+@@ -0,0 +0,0 @@ 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 {
 --
\ No newline at end of file