3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-15 11:00:06 +01:00

Revert "Fixes exception log messages getting dropped during bootstrap (#10935)" (Closes #10945)

This reverts commit 2118196dd5.
Dieser Commit ist enthalten in:
Shane Freeder 2024-06-21 10:05:27 +01:00
Ursprung 8b1d26df0b
Commit 0a1b133c28
Es konnte kein GPG-Schlüssel zu dieser Signatur gefunden werden
GPG-Schlüssel-ID: A3F61EA5A085289C

Datei anzeigen

@ -94,21 +94,6 @@ index 3270bb6fe1c8b08411e6cad14d48cec886085ee7..407f3c1938b5b5d893b09705fe4930db
} }
// CraftBukkit start // 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 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 index b2812cc8d35074fdcff88beef088d9f63ebbe1a8..dc591702d1ad41209bb80e8d05f4ca11f20816f2 100644
--- a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java --- a/src/main/java/org/bukkit/craftbukkit/legacy/CraftLegacy.java