From 2118196dd57f9b7100b2d15b552d3c00fc5a55fa Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Thu, 20 Jun 2024 11:26:07 -0700
Subject: [PATCH] Fixes exception log messages getting dropped during bootstrap
 (#10935)

---
 .../server/0788-Improve-logging-and-errors.patch  | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/patches/server/0788-Improve-logging-and-errors.patch b/patches/server/0788-Improve-logging-and-errors.patch
index 243a962373..9a90b28e0c 100644
--- a/patches/server/0788-Improve-logging-and-errors.patch
+++ b/patches/server/0788-Improve-logging-and-errors.patch
@@ -94,6 +94,21 @@ 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