From 9c16c413ec44417a1decd5df2f2cfadf13e759b9 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 16 Jul 2020 19:07:15 -0400
Subject: [PATCH] [Auto] Updated Upstream (CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
75a2fb8e0 SPIGOT-5901: Improve multiworld support
---
 ...42-Properly-handle-async-calls-to-restart-the-server.patch | 4 ++--
 Spigot-Server-Patches/0370-incremental-chunk-saving.patch     | 4 ++--
 work/CraftBukkit                                              | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Spigot-Server-Patches/0142-Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/0142-Properly-handle-async-calls-to-restart-the-server.patch
index ecce73596d..11cd334237 100644
--- a/Spigot-Server-Patches/0142-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/Spigot-Server-Patches/0142-Properly-handle-async-calls-to-restart-the-server.patch
@@ -73,11 +73,11 @@ index 793d4d928bac4febf090291eb773871b492cdc6d..28478370fc182751178f7dd6c2043521
      // Spigot Start
      private static double calcTps(double avg, double exp, double tps)
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index bfe7848655498287e357593259e188f161292d3e..27a79ee13dc65f389136dc1cc1546259d9a89f9c 100644
+index 8bc8c20f0cbf909bd11f360d14926ba29637f779..ae75b114a1aee1bf267c678c581bbde4e875f963 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1072,10 +1072,15 @@ public abstract class PlayerList {
-         entityplayer.playerInteractManager.b(worldserver.getMinecraftServer().getSaveData().getGameType());
+         entityplayer.playerInteractManager.b(worldserver.worldDataServer.getGameType()); // CraftBukkit
      }
  
 +    // Paper start - Extract method to allow for restarting flag
diff --git a/Spigot-Server-Patches/0370-incremental-chunk-saving.patch b/Spigot-Server-Patches/0370-incremental-chunk-saving.patch
index fc879115dd..17e14aad2c 100644
--- a/Spigot-Server-Patches/0370-incremental-chunk-saving.patch
+++ b/Spigot-Server-Patches/0370-incremental-chunk-saving.patch
@@ -257,7 +257,7 @@ index 6dda11ffc022aa9bc7481506811a710a184f5e78..39d89d6209123ae2146ae292009cad44
                      return PlayerChunk.getChunkState(playerchunk.getTicketLevel());
                  });
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 45959064c310997d26c5637a0e5cb61775c406c9..e0023c77736bd67bde63e6ebd1822cd0a7918508 100644
+index 7b4182a0dc9aaa76f0a4a3b09cc497bcb9704277..0286bc56d49e586dde506071e5e72423f157bd52 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -767,11 +767,43 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -312,4 +312,4 @@ index 45959064c310997d26c5637a0e5cb61775c406c9..e0023c77736bd67bde63e6ebd1822cd0
 +    private void saveData() { this.ag(); } // Paper - OBFHELPER
      private void ag() {
          if (this.dragonBattle != null) {
-             this.server.getSaveData().a(this.dragonBattle.a());
+             this.worldDataServer.a(this.dragonBattle.a()); // CraftBukkit
diff --git a/work/CraftBukkit b/work/CraftBukkit
index b0c6dfe1ae..75a2fb8e0b 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit b0c6dfe1ae6fd5907379ba180851f94f45a8a2da
+Subproject commit 75a2fb8e0be1be0351966f9824648eeb58167b44