From 837cf98b9eab46cef19228f25b5df74f60909b04 Mon Sep 17 00:00:00 2001 From: Automated 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 --- .../Properly-handle-async-calls-to-restart-the-server.patch | 2 +- Spigot-Server-Patches/incremental-chunk-saving.patch | 2 +- work/CraftBukkit | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Spigot-Server-Patches/Properly-handle-async-calls-to-restart-the-server.patch b/Spigot-Server-Patches/Properly-handle-async-calls-to-restart-the-server.patch index 8e6af2a1c6..1ac6ac565e 100644 --- a/Spigot-Server-Patches/Properly-handle-async-calls-to-restart-the-server.patch +++ b/Spigot-Server-Patches/Properly-handle-async-calls-to-restart-the-server.patch @@ -77,7 +77,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 --- a/src/main/java/net/minecraft/server/PlayerList.java +++ b/src/main/java/net/minecraft/server/PlayerList.java @@ -0,0 +0,0 @@ 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/incremental-chunk-saving.patch b/Spigot-Server-Patches/incremental-chunk-saving.patch index 95feb1c103..4cda1db64c 100644 --- a/Spigot-Server-Patches/incremental-chunk-saving.patch +++ b/Spigot-Server-Patches/incremental-chunk-saving.patch @@ -312,4 +312,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 + 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