diff options
author | Shane Freeder <[email protected]> | 2022-03-02 09:44:22 +0000 |
---|---|---|
committer | Shane Freeder <[email protected]> | 2022-03-02 09:44:22 +0000 |
commit | c6ea84c7fae8d2974820333505a39c7b01c39b90 (patch) | |
tree | 0a863ecd50aa71b1196200c545651fe7eb779e2a /patches/server/0740-Log-when-the-async-catcher-is-tripped.patch | |
parent | d3caeeb6c27cc832030a90c714a69ad2457b6e95 (diff) | |
download | Paper-c6ea84c7fae8d2974820333505a39c7b01c39b90.tar.gz Paper-c6ea84c7fae8d2974820333505a39c7b01c39b90.zip |
Drop unneeded desync patch
spigot no longer even fires the event for this case, so, this may
actually be a regression, not too sure here, but, as-is this patch
is dead
Diffstat (limited to 'patches/server/0740-Log-when-the-async-catcher-is-tripped.patch')
-rw-r--r-- | patches/server/0740-Log-when-the-async-catcher-is-tripped.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/patches/server/0740-Log-when-the-async-catcher-is-tripped.patch b/patches/server/0740-Log-when-the-async-catcher-is-tripped.patch new file mode 100644 index 0000000000..bede76faf6 --- /dev/null +++ b/patches/server/0740-Log-when-the-async-catcher-is-tripped.patch @@ -0,0 +1,20 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Spottedleaf <[email protected]> +Date: Wed, 25 Aug 2021 20:17:12 -0700 +Subject: [PATCH] Log when the async catcher is tripped + +The chunk system can swallow the exception given it's all +built with completablefuture, so ensure it is at least printed. + +diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java +index 7585a30e8f063ac2656b5de519b1e9edaceffbc7..0c41413ad32f8f6a094462fcd637dd3229abda45 100644 +--- a/src/main/java/org/spigotmc/AsyncCatcher.java ++++ b/src/main/java/org/spigotmc/AsyncCatcher.java +@@ -12,6 +12,7 @@ public class AsyncCatcher + { + if ( (AsyncCatcher.enabled || io.papermc.paper.util.TickThread.STRICT_THREAD_CHECKS) && Thread.currentThread() != MinecraftServer.getServer().serverThread ) // Paper + { ++ MinecraftServer.LOGGER.error("Thread " + Thread.currentThread().getName() + " failed main thread check: " + reason, new Throwable()); // Paper + throw new IllegalStateException( "Asynchronous " + reason + "!" ); + } + } |