[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
This commit is contained in:
Automated
2020-07-16 19:07:15 -04:00
parent 0580766485
commit 837cf98b9e
3 changed files with 3 additions and 3 deletions

View File

@@ -77,7 +77,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
--- a/src/main/java/net/minecraft/server/PlayerList.java --- a/src/main/java/net/minecraft/server/PlayerList.java
+++ b/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 { @@ -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 + // Paper start - Extract method to allow for restarting flag

View File

@@ -312,4 +312,4 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ private void saveData() { this.ag(); } // Paper - OBFHELPER + private void saveData() { this.ag(); } // Paper - OBFHELPER
private void ag() { private void ag() {
if (this.dragonBattle != null) { if (this.dragonBattle != null) {
this.server.getSaveData().a(this.dragonBattle.a()); this.worldDataServer.a(this.dragonBattle.a()); // CraftBukkit