mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-21 18:37:42 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@bd62f2c Fix chat messages being logged without formatting to console (#9058) PaperMC/Paper@ce2a36d Fix PluginMeta#getDisplayName (#9038) PaperMC/Paper@9940019 Deprecate public Timings classes for removal (#8949) PaperMC/Paper@5c78e77 Fix api checking banned ips (#9026)
This commit is contained in:
@@ -5,10 +5,10 @@ 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 3719a6e1228840977e2dcf939629655c8ea6216f..08a23e0d6a575febb90e4f1bfe4f89cea5acaa01 100644
|
||||
index ca1d7de70edeafe1eb6a0b47d622fd6c8ff03841..7bb6b71d258cf85c1f86566ea7bd869b6186bbdf 100644
|
||||
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
|
||||
@@ -310,6 +310,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||
@@ -311,6 +311,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||
public final io.papermc.paper.configuration.PaperConfigurations paperConfigurations;
|
||||
public static long currentTickLong = 0L; // Paper
|
||||
public boolean lagging = false; // Purpur
|
||||
@@ -16,7 +16,7 @@ index 3719a6e1228840977e2dcf939629655c8ea6216f..08a23e0d6a575febb90e4f1bfe4f89ce
|
||||
|
||||
public volatile Thread shutdownThread; // Paper
|
||||
public volatile boolean abnormalExit = false; // Paper
|
||||
@@ -945,6 +946,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||
@@ -946,6 +947,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
|
||||
MinecraftServer.LOGGER.info("Stopping server");
|
||||
Commands.COMMAND_SENDING_POOL.shutdownNow(); // Paper - Shutdown and don't bother finishing
|
||||
MinecraftTimings.stopServer(); // Paper
|
||||
|
||||
Reference in New Issue
Block a user