aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorShane Freeder <[email protected]>2024-06-21 10:05:27 +0100
committerShane Freeder <[email protected]>2024-06-21 10:06:03 +0100
commit0a1b133c28bfa9b71cd23a10b42b521ad50aacb5 (patch)
treeaccc5f141e0e8747c2b489b46ecb22b2ed5665d7
parent8b1d26df0b082ab830b00870894c8d5849c96a31 (diff)
downloadPaper-0a1b133c28bfa9b71cd23a10b42b521ad50aacb5.tar.gz
Paper-0a1b133c28bfa9b71cd23a10b42b521ad50aacb5.zip
Revert "Fixes exception log messages getting dropped during bootstrap (#10935)" (Closes #10945)
This reverts commit 2118196dd57f9b7100b2d15b552d3c00fc5a55fa.
-rw-r--r--patches/server/0788-Improve-logging-and-errors.patch15
1 files changed, 0 insertions, 15 deletions
diff --git a/patches/server/0788-Improve-logging-and-errors.patch b/patches/server/0788-Improve-logging-and-errors.patch
index 9a90b28e0c..243a962373 100644
--- a/patches/server/0788-Improve-logging-and-errors.patch
+++ b/patches/server/0788-Improve-logging-and-errors.patch
@@ -94,21 +94,6 @@ index 3270bb6fe1c8b08411e6cad14d48cec886085ee7..407f3c1938b5b5d893b09705fe4930db
}
// CraftBukkit start
-diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 6e1f92b45504cef0c4dcbbebf3df339ef4cad0a1..b63e965d726a5c96ec4f3aa16016f3610bb3f95a 100644
---- a/src/main/java/org/bukkit/craftbukkit/Main.java
-+++ b/src/main/java/org/bukkit/craftbukkit/Main.java
-@@ -298,6 +298,10 @@ public class Main {
- net.minecraft.server.Main.main(options);
- } catch (Throwable t) {
- t.printStackTrace();
-+ // Paper start - shutdown log manager to flush appenders
-+ } finally {
-+ org.apache.logging.log4j.LogManager.shutdown();
-+ // Paper end
- }
- }
- }
diff --git a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java b/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java
index b2812cc8d35074fdcff88beef088d9f63ebbe1a8..dc591702d1ad41209bb80e8d05f4ca11f20816f2 100644
--- a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java