Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@b8edb0e Updated Upstream (Bukkit/CraftBukkit/Spigot) (#9648)
PaperMC/Paper@b4e3b3d Allow non-op players to execute the click event callback (#9652)
This commit is contained in:
granny
2023-08-29 03:15:55 -07:00
parent 6e2126ffcb
commit 423c2af60c
17 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
patches/server/0220-UPnP-Port-Forwarding.patch
View File

@@ -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 f814bb61cb6981202db1a04ef3c114afb0aa55ee..cf165386904e4f084ff69463e29fe10fd9af6812 100644
index 49286716235f3bd49cbc42ef693daafba746f930..3a9fe6d9f2e7406ffc368e2dadaab803b591f5c2 100644
--- a/src/main/java/net/minecraft/server/MinecraftServer.java
+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -309,6 +309,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -308,6 +308,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 f814bb61cb6981202db1a04ef3c114afb0aa55ee..cf165386904e4f084ff69463e29fe10f
public volatile Thread shutdownThread; // Paper
public volatile boolean abnormalExit = false; // Paper
@@ -942,6 +943,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -941,6 +942,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
@@ -32,7 +32,7 @@ index f814bb61cb6981202db1a04ef3c114afb0aa55ee..cf165386904e4f084ff69463e29fe10f
if (this.server != null) {
this.server.disablePlugins();
diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
index 012c990efb2647b0a3e983b23fed98c6e3f2224b..62c437f5618032b78d1b68c5c2490d4db9941ce6 100644
index 8089e9ff60c6f7a5f06bbb46b53b07d6a588cea3..c8902e2783026c85eaf0c16541adf67173ed4058 100644
--- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
+++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
@@ -278,6 +278,30 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface