diff options
| author | Nassim Jahnke <[email protected]> | 2022-07-28 02:02:40 +0200 |
|---|---|---|
| committer | Nassim Jahnke <[email protected]> | 2022-07-28 02:02:40 +0200 |
| commit | 71544ab01fbffcd2457deb4ae113cf735f14c0a4 (patch) | |
| tree | 00c8312ad4a150decdc4074b3e7e8c5c6c233e94 | |
| parent | c488d15359ff4817cedada24a96f884be8124da5 (diff) | |
| download | Paper-71544ab01fbffcd2457deb4ae113cf735f14c0a4.tar.gz Paper-71544ab01fbffcd2457deb4ae113cf735f14c0a4.zip | |
Readd deobfuscation of chat executor stacktraces
| -rw-r--r-- | patches/server/0409-Deobfuscate-stacktraces-in-log-messages-crash-report.patch | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/patches/server/0409-Deobfuscate-stacktraces-in-log-messages-crash-report.patch b/patches/server/0409-Deobfuscate-stacktraces-in-log-messages-crash-report.patch index 14331bc03f..d7720a7c27 100644 --- a/patches/server/0409-Deobfuscate-stacktraces-in-log-messages-crash-report.patch +++ b/patches/server/0409-Deobfuscate-stacktraces-in-log-messages-crash-report.patch @@ -502,7 +502,7 @@ index f114d5dab86aa2cdd59c78406c9d82f9caededca..99fa9f1952ee7ed79b223ff210a658e4 } } diff --git a/src/main/java/net/minecraft/network/Connection.java b/src/main/java/net/minecraft/network/Connection.java -index a18e2146c4398b45ae50623fc6800a78718f4c81..c06cb0f0e300c4d00b3aeed12772c38e8379cb0c 100644 +index 2d1db70456b746c8fab77893cb34240e573b92ca..7e11d760f84d2cda85e686c5eca764e666e9389f 100644 --- a/src/main/java/net/minecraft/network/Connection.java +++ b/src/main/java/net/minecraft/network/Connection.java @@ -62,13 +62,13 @@ public class Connection extends SimpleChannelInboundHandler<Packet<?>> { @@ -522,6 +522,19 @@ index a18e2146c4398b45ae50623fc6800a78718f4c81..c06cb0f0e300c4d00b3aeed12772c38e }); private final PacketFlow receiving; private final Queue<Connection.PacketHolder> queue = Queues.newConcurrentLinkedQueue(); +diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java +index af2d703fe3cb74ced502ca89c5bf6ca1f47474bb..7ca8941ade15c073939c198334bfba78dfcc3c08 100644 +--- a/src/main/java/net/minecraft/server/MinecraftServer.java ++++ b/src/main/java/net/minecraft/server/MinecraftServer.java +@@ -2527,7 +2527,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa + + // CraftBukkit start + public final java.util.concurrent.ExecutorService chatExecutor = java.util.concurrent.Executors.newCachedThreadPool( +- new com.google.common.util.concurrent.ThreadFactoryBuilder().setDaemon(true).setNameFormat("Async Chat Thread - #%d").build()); ++ new com.google.common.util.concurrent.ThreadFactoryBuilder().setDaemon(true).setNameFormat("Async Chat Thread - #%d").setUncaughtExceptionHandler(new net.minecraft.DefaultUncaughtExceptionHandlerWithName(net.minecraft.server.MinecraftServer.LOGGER)).build()); // Paper + + public ChatDecorator getChatDecorator() { + return (entityplayer, ichatbasecomponent) -> { diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java index 648bc209938364a387c3f81dcd073db398e9f864..e42df2956e2d852a5a4c8fdeda395a3efd32c44c 100644 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java |