From 89c648bcd7c53337091623152e0557dbd8c4e9e0 Mon Sep 17 00:00:00 2001 From: Jason <11360596+jpenilla@users.noreply.github.com> Date: Tue, 14 Sep 2021 12:23:56 -0500 Subject: [PATCH] Fix log message formatting when classes not owned by plugins use sysout (#6604) --- patches/server/0725-Add-System.out-err-catcher.patch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/patches/server/0725-Add-System.out-err-catcher.patch b/patches/server/0725-Add-System.out-err-catcher.patch index fbcfa2442..c6584c7c1 100644 --- a/patches/server/0725-Add-System.out-err-catcher.patch +++ b/patches/server/0725-Add-System.out-err-catcher.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add System.out/err 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..88608afed45f25f822121214f87e9f9b53143104 +index 0000000000000000000000000000000000000000..76d0d00cd6742991e3f3ec827a75ee87d856b6c9 --- /dev/null +++ b/src/main/java/io/papermc/paper/logging/SysoutCatcher.java @@ -0,0 +1,94 @@ @@ -94,7 +94,7 @@ index 0000000000000000000000000000000000000000..88608afed45f25f822121214f87e9f9b + } 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)); ++ Bukkit.getLogger().log(this.level, String.format("%s[%s] %s", this.prefix, clazz.getName(), line)); + } + } + }