aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0727-Fix-plugin-loggers-on-server-shutdown.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0727-Fix-plugin-loggers-on-server-shutdown.patch')
-rw-r--r--patches/server/0727-Fix-plugin-loggers-on-server-shutdown.patch67
1 files changed, 67 insertions, 0 deletions
diff --git a/patches/server/0727-Fix-plugin-loggers-on-server-shutdown.patch b/patches/server/0727-Fix-plugin-loggers-on-server-shutdown.patch
new file mode 100644
index 0000000000..7f6f4755d1
--- /dev/null
+++ b/patches/server/0727-Fix-plugin-loggers-on-server-shutdown.patch
@@ -0,0 +1,67 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jos=C3=A9=20Miguel=20Moreno?= <[email protected]>
+Date: Sat, 5 Jun 2021 13:45:15 +0200
+Subject: [PATCH] Fix plugin loggers on server shutdown
+
+
+diff --git a/src/main/java/io/papermc/paper/log/CustomLogManager.java b/src/main/java/io/papermc/paper/log/CustomLogManager.java
+new file mode 100644
+index 0000000000000000000000000000000000000000..c1d3bac79bb8b4796c013ff4472f75dcd79602dc
+--- /dev/null
++++ b/src/main/java/io/papermc/paper/log/CustomLogManager.java
+@@ -0,0 +1,26 @@
++package io.papermc.paper.log;
++
++import java.util.logging.LogManager;
++
++public class CustomLogManager extends LogManager {
++ private static CustomLogManager instance;
++
++ public CustomLogManager() {
++ instance = this;
++ }
++
++ @Override
++ public void reset() {
++ // Ignore calls to this method
++ }
++
++ private void superReset() {
++ super.reset();
++ }
++
++ public static void forceReset() {
++ if (instance != null) {
++ instance.superReset();
++ }
++ }
++}
+diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
+index aa9a4a0f35d0200777bdc83520ba82a970bfa900..cb40a2d855e7ac8c1c8b4ec679fd057a31f3fc6f 100644
+--- a/src/main/java/net/minecraft/server/MinecraftServer.java
++++ b/src/main/java/net/minecraft/server/MinecraftServer.java
+@@ -1277,6 +1277,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
+ } catch (Exception ignored) {
+ }
+ // CraftBukkit end
++ io.papermc.paper.log.CustomLogManager.forceReset(); // Paper - Reset loggers after shutdown
+ this.onServerExit();
+ }
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
+index 124aeebbbae7dc8cea1260bf3134a339c2e152ed..a7524d3853d5b67b6385d2b74832b9267503dfe6 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -19,6 +19,12 @@ public class Main {
+ public static boolean useJline = true;
+ public static boolean useConsole = true;
+
++ // Paper start - Reset loggers after shutdown
++ static {
++ System.setProperty("java.util.logging.manager", "io.papermc.paper.log.CustomLogManager");
++ }
++ // Paper end - Reset loggers after shutdown
++
+ public static void main(String[] args) {
+ // Paper start
+ final String warnWhenLegacyFormattingDetected = String.join(".", "net", "kyori", "adventure", "text", "warnWhenLegacyFormattingDetected");