mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 12:27:59 +01:00
[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:
parent
0580766485
commit
837cf98b9e
@ -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
|
||||
|
@ -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
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit b0c6dfe1ae6fd5907379ba180851f94f45a8a2da
|
||||
Subproject commit 75a2fb8e0be1be0351966f9824648eeb58167b44
|
Loading…
Reference in New Issue
Block a user