From 6226208d64716a6d68e0d26f7df19d7c1290062c Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Wed, 4 Aug 2021 04:04:12 +0100
Subject: [PATCH] Fix SysoutCatcher when plugins log before initialisation
 (Fixes #6323)

---
 patches/server/0733-Add-System.out.println-catcher.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/patches/server/0733-Add-System.out.println-catcher.patch b/patches/server/0733-Add-System.out.println-catcher.patch
index dbb98d29e..c2171fb57 100644
--- a/patches/server/0733-Add-System.out.println-catcher.patch
+++ b/patches/server/0733-Add-System.out.println-catcher.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Add System.out.println catcher
 
 diff --git a/src/main/java/io/papermc/paper/logging/SysoutCatcher.java b/src/main/java/io/papermc/paper/logging/SysoutCatcher.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..e61b58f607dc83f5bb73b6cde50f3e8303849385
+index 0000000000000000000000000000000000000000..fd2af675d32e497fabd35f57b9e7c53ece97e6bd
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/logging/SysoutCatcher.java
 @@ -0,0 +1,56 @@
@@ -58,7 +58,7 @@ index 0000000000000000000000000000000000000000..e61b58f607dc83f5bb73b6cde50f3e83
 +                        plugin.getDescription().getAuthors(),
 +                        plugin.getName())
 +                );
-+            } catch (final IllegalArgumentException e) {
++            } catch (final IllegalArgumentException | IllegalStateException e) {
 +                // If anything happens, the calling class doesn't exist, there is no JavaPlugin that "owns" the calling class, etc
 +                // Just print out normally, with some added information
 +                Bukkit.getLogger().log(this.level, String.format("[%s] %s %s", this.prefix, clazz.getName(), line));