Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
a55617d9ce Fix/improve the last upstream update (#6780)
72a3175165 Updated Upstream (Bukkit/CraftBukkit) (#6791)
eaee7a2473 Use correct LevelStem registry when loading default end/nether (#6789)
This commit is contained in:
William Blake Galbreath
2021-10-17 20:22:22 -05:00
parent db65efba2b
commit 2df73e0ed8
10 changed files with 24 additions and 24 deletions

View File

@@ -5,7 +5,7 @@ Subject: [PATCH] UPnP Port Forwarding
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
index 9cf2fc8512a6df0952bf6c534627cd66f47d1e7d..c46238a1e2d018ade017583dbc761cd88f81392b 100644
index 80e81d4482f4e4451150d3d3cc8fe244be35d6e9..f415108a98fdb0c4e1c569452e387c3defa4211f 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -311,6 +311,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -16,7 +16,7 @@ index 9cf2fc8512a6df0952bf6c534627cd66f47d1e7d..c46238a1e2d018ade017583dbc761cd8
public volatile Thread shutdownThread; // Paper
public volatile boolean abnormalExit = false; // Paper
@@ -1042,6 +1043,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1047,6 +1048,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// CraftBukkit end
MinecraftServer.LOGGER.info("Stopping server");
MinecraftTimings.stopServer(); // Paper