Final 1.17 Upstream Update (Paper)

PaperMC/Paper@4d6073f Partially fix #6880 (#6888)
PaperMC/Paper@f8992ee Extend Entity by Sound.Emitter (#6890)
PaperMC/Paper@db0bff9 Call onRemove logic for breakNaturally (#6854)
PaperMC/Paper@72b731b Updated Upstream (CraftBukkit) (#6885)
PaperMC/Paper@555f99d cleanup: Add hand to bucket events patch (#6881)
PaperMC/Paper@51b7b60 Add API for resetting a single score (#6873)
PaperMC/Paper@f3830bc Update paperweight to 1.2.0 (#6901)
PaperMC/Paper@e22a1a9 Fix more namespacedkey parsing (#6903)
PaperMC/Paper@284b3b8 Fix AnvilPrepareEvent not working with zero xp (#6895)
PaperMC/Paper@22aaf91 Add config option to enable hopper occluding blocks (#6896)
This commit is contained in:
Ben Kerllenevich
2021-11-23 08:10:26 -05:00
parent 7037004849
commit 9beb23b8c3
18 changed files with 63 additions and 61 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 d71b5595dc2795f48007c07ce59bb5b19a80ff52..bf747e14837699cbd95819bc2a98cdf4057f0137 100644
index c69d4fdb9ec8a33f6d2fc5f689671cb8eb394142..3ba0e6d49965e39f8571908adf548b70f4dbe776 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 d71b5595dc2795f48007c07ce59bb5b19a80ff52..bf747e14837699cbd95819bc2a98cdf4
public volatile Thread shutdownThread; // Paper
public volatile boolean abnormalExit = false; // Paper
@@ -1048,6 +1049,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -1050,6 +1051,14 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
// CraftBukkit end
MinecraftServer.LOGGER.info("Stopping server");
MinecraftTimings.stopServer(); // Paper