Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@b45d9b6 Fix summon_entity effect attempting to add incorrect entity (#11004)
PaperMC/Paper@7eec21e [ci skip] add adventure-key javadoc (#11014)
PaperMC/Paper@8c8b227 Execute chunk tasks mid-tick
This commit is contained in:
granny
2024-07-04 02:47:07 -07:00
parent faa1f93b6f
commit 1ab7990b14
25 changed files with 138 additions and 157 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 d2ec3b09bd5176f339fb618e4a1c89959fc0b7ff..64d31cfcd70c7186c2b0f93536922ed903eba368 100644
index 1eedf6b371834e307fd6010721c1f6eb94a5dbd2..4dd18ac6fd51cf0db7bb3a3290db7d5461984b7a 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -321,6 +321,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -16,7 +16,7 @@ index d2ec3b09bd5176f339fb618e4a1c89959fc0b7ff..64d31cfcd70c7186c2b0f93536922ed9
public volatile Thread shutdownThread; // Paper
public volatile boolean abnormalExit = false; // Paper
@@ -985,6 +986,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1047,6 +1048,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
MinecraftServer.LOGGER.info("Stopping server");
Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Perf: Async command map building; Shutdown and don't bother finishing
MinecraftTimings.stopServer(); // Paper