mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-18 17:07:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@aab1f8a Fix swamp hut cat generation deadlock PaperMC/Paper@dc96bba Ensure the item sent isn't air (#7584) PaperMC/Paper@bfa33d9 Various improvements to console color formatting (#7560) PaperMC/Paper@87927e1 Fix CreativeCategory API (#7586) PaperMC/Paper@ab03538 Fix colors in some console messages PaperMC/Paper@1358d1e Updated Upstream (CraftBukkit/Spigot) (#7580)
This commit is contained in:
@@ -17,10 +17,10 @@ index 362fd34016b83ba346a43abb6acf38d887918437..c137f5299e4a9e2f33aeef77818c62c3
|
||||
|
||||
if (environment.includeIntegrated) {
|
||||
diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
index 219eb6598cb55612fe6e31aa0c367d7eecb92a5a..1b80586e951e1907daacf5d8ffca6da6d713d3eb 100644
|
||||
index b15647b6cf2495b15a994ab32a4d53cb3890d9b6..38eee8b34caaee7fb4e05dd08b1854afd0052368 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -1089,6 +1089,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||
@@ -1087,6 +1087,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||
this.safeShutdown(flag, false);
|
||||
}
|
||||
public void safeShutdown(boolean flag, boolean isRestarting) {
|
||||
|
||||
Reference in New Issue
Block a user