Begin update to 1.20.5

patches/server/0364-misc-debugging-dumps.patch

@@ -1,111 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Shane Freeder <theboyetronic@gmail.com>
-Date: Thu, 18 Feb 2021 20:23:28 +0000
-Subject: [PATCH] misc debugging dumps
-
-
-diff --git a/src/main/java/io/papermc/paper/util/TraceUtil.java b/src/main/java/io/papermc/paper/util/TraceUtil.java
-new file mode 100644
-index 0000000000000000000000000000000000000000..2d5494d2813b773e60ddba6790b750a9a08f21f8
---- /dev/null
-+++ b/src/main/java/io/papermc/paper/util/TraceUtil.java
-@@ -0,0 +1,18 @@
-+package io.papermc.paper.util;
-+
-+import org.bukkit.Bukkit;
-+
-+public final class TraceUtil {
-+
-+    public static void dumpTraceForThread(Thread thread, String reason) {
-+        Bukkit.getLogger().warning(thread.getName() + ": " + reason);
-+        StackTraceElement[] trace = thread.getStackTrace();
-+        for (StackTraceElement traceElement : trace) {
-+            Bukkit.getLogger().warning("\tat " + traceElement);
-+        }
-+    }
-+
-+    public static void dumpTraceForThread(String reason) {
-+        new Throwable(reason).printStackTrace();
-+    }
-+}
-diff --git a/src/main/java/net/minecraft/commands/Commands.java b/src/main/java/net/minecraft/commands/Commands.java
-index 40ff3090fb17fb0f01a9b52639fb783ea57ce6b6..d39743d9626eb01c942194387dafb1106f13601b 100644
---- a/src/main/java/net/minecraft/commands/Commands.java
-+++ b/src/main/java/net/minecraft/commands/Commands.java
-@@ -341,7 +341,7 @@ public class Commands {
-         } catch (Exception exception) {
-             MutableComponent ichatmutablecomponent = Component.literal(exception.getMessage() == null ? exception.getClass().getName() : exception.getMessage());
- 
--            if (Commands.LOGGER.isDebugEnabled()) {
-+            if (commandlistenerwrapper.getServer().isDebugging() || Commands.LOGGER.isDebugEnabled()) { // Paper - Debugging
-                 Commands.LOGGER.error("Command exception: /{}", s, exception);
-                 StackTraceElement[] astacktraceelement = exception.getStackTrace();
- 
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1a7dffb3947dab0e334cd5873c69542f383aed61..f4e9929c956585a9305c2b40a995ec4fff08e7e4 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -904,6 +904,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
- 
-     // CraftBukkit start
-     private boolean hasStopped = false;
-+    private boolean hasLoggedStop = false; // Paper - Debugging
-     private final Object stopLock = new Object();
-     public final boolean hasStopped() {
-         synchronized (this.stopLock) {
-@@ -918,6 +919,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-             if (this.hasStopped) return;
-             this.hasStopped = true;
-         }
-+        if (!hasLoggedStop && isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper - Debugging
-         // CraftBukkit end
-         if (this.metricsRecorder.isRecording()) {
-             this.cancelRecordingMetrics();
-@@ -1021,6 +1023,8 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
-     }
-     public void safeShutdown(boolean waitForShutdown, boolean isRestarting) {
-         this.isRestarting = isRestarting;
-+        this.hasLoggedStop = true; // Paper - Debugging
-+        if (isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread("Server stopped"); // Paper - Debugging
-         // Paper end
-         this.running = false;
-         if (waitForShutdown) {
-diff --git a/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
-index 04a728a16bb629adbae1cd8586764a6dbc22b5dc..e2537760becdd5b3f3561f7159ed7fc2755e6260 100644
---- a/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
-+++ b/src/main/java/net/minecraft/server/network/ServerConfigurationPacketListenerImpl.java
-@@ -57,6 +57,10 @@ public class ServerConfigurationPacketListenerImpl extends ServerCommonPacketLis
- 
-     @Override
-     public void onDisconnect(Component reason) {
-+        // Paper start - Debugging
-+        if (net.minecraft.server.MinecraftServer.getServer().isDebugging()) {
-+            ServerConfigurationPacketListenerImpl.LOGGER.info("{} lost connection: {}, while in configuration phase {}", this.gameProfile, reason.getString(), currentTask != null ? currentTask.type().id() : "null");
-+        } else // Paper end
-         ServerConfigurationPacketListenerImpl.LOGGER.info("{} lost connection: {}", this.gameProfile, reason.getString());
-         super.onDisconnect(reason);
-     }
-@@ -131,6 +135,11 @@ public class ServerConfigurationPacketListenerImpl extends ServerCommonPacketLis
-             this.connection.resumeInboundAfterProtocolChange();
-         } catch (Exception exception) {
-             ServerConfigurationPacketListenerImpl.LOGGER.error("Couldn't place player in world", exception);
-+            // Paper start - Debugging
-+            if (MinecraftServer.getServer().isDebugging()) {
-+                exception.printStackTrace();
-+            }
-+            // Paper end - Debugging
-             this.connection.send(new ClientboundDisconnectPacket(ServerConfigurationPacketListenerImpl.DISCONNECT_REASON_INVALID_DATA));
-             this.connection.disconnect(ServerConfigurationPacketListenerImpl.DISCONNECT_REASON_INVALID_DATA);
-         }
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 356f737e4b224ed7d9692dcaf2a91617058e23ed..0a6b283aee63adb09cf1466fb18406f941466cd0 100644
---- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -1018,6 +1018,7 @@ public final class CraftServer implements Server {
-                 plugin.getDescription().getFullName(),
-                 "This plugin is not properly shutting down its async tasks when it is being reloaded.  This may cause conflicts with the newly loaded version of the plugin"
-             ));
-+            if (console.isDebugging()) io.papermc.paper.util.TraceUtil.dumpTraceForThread(worker.getThread(), "still running"); // Paper - Debugging
-         }
-         io.papermc.paper.plugin.PluginInitializerManager.reload(this.console); // Paper
-         this.loadPlugins();