From f2a6120c85af04f0e37fd1eb7448994ced3ed3cb Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Sun, 23 Nov 2025 04:34:40 -0500 Subject: [PATCH] Remove toggleable async catcher This option is useless, especially provided as an config option, since the normal server owners have no reasons to use it. And even for developers, this option is still unnecessary to use. It's also a very simple toggle which can be done in local stage during debugging or fixing specific issue. --- .../0058-Toggleable-async-catcher.patch | 18 ------------------ ...ata.patch => 0058-cache-profile-data.patch} | 0 ...abled-in-CraftCrafter-setSlotDisable.patch} | 0 ...e-stream-in-CraftWorld-spawnParticle.patch} | 0 4 files changed, 18 deletions(-) delete mode 100644 leaf-server/paper-patches/features/0058-Toggleable-async-catcher.patch rename leaf-server/paper-patches/features/{0059-cache-profile-data.patch => 0058-cache-profile-data.patch} (100%) rename leaf-server/paper-patches/features/{0060-Fix-inverted-disabled-in-CraftCrafter-setSlotDisable.patch => 0059-Fix-inverted-disabled-in-CraftCrafter-setSlotDisable.patch} (100%) rename leaf-server/paper-patches/features/{0061-Remove-stream-in-CraftWorld-spawnParticle.patch => 0060-Remove-stream-in-CraftWorld-spawnParticle.patch} (100%) diff --git a/leaf-server/paper-patches/features/0058-Toggleable-async-catcher.patch b/leaf-server/paper-patches/features/0058-Toggleable-async-catcher.patch deleted file mode 100644 index 69e74b28..00000000 --- a/leaf-server/paper-patches/features/0058-Toggleable-async-catcher.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Taiyou06 -Date: Tue, 8 Jul 2025 12:08:25 +0200 -Subject: [PATCH] Toggleable async catcher - - -diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java -index 7e7a0ed944961af5ab7a49bc659da2862d2e2c82..2522890b326c21434e10b90c774efbc8590117b3 100644 ---- a/src/main/java/org/spigotmc/AsyncCatcher.java -+++ b/src/main/java/org/spigotmc/AsyncCatcher.java -@@ -5,6 +5,7 @@ import net.minecraft.server.MinecraftServer; - public class AsyncCatcher { - - public static void catchOp(String reason) { -+ if (!org.dreeam.leaf.config.modules.misc.AsyncCatcherConfig.enabled) return; // Leaf - Toggleable async catcher - if (!ca.spottedleaf.moonrise.common.util.TickThread.isTickThread()) { // Paper - chunk system - MinecraftServer.LOGGER.error("Thread {} failed main thread check: {}", Thread.currentThread().getName(), reason, new Throwable()); // Paper - throw new IllegalStateException("Asynchronous " + reason + "!"); diff --git a/leaf-server/paper-patches/features/0059-cache-profile-data.patch b/leaf-server/paper-patches/features/0058-cache-profile-data.patch similarity index 100% rename from leaf-server/paper-patches/features/0059-cache-profile-data.patch rename to leaf-server/paper-patches/features/0058-cache-profile-data.patch diff --git a/leaf-server/paper-patches/features/0060-Fix-inverted-disabled-in-CraftCrafter-setSlotDisable.patch b/leaf-server/paper-patches/features/0059-Fix-inverted-disabled-in-CraftCrafter-setSlotDisable.patch similarity index 100% rename from leaf-server/paper-patches/features/0060-Fix-inverted-disabled-in-CraftCrafter-setSlotDisable.patch rename to leaf-server/paper-patches/features/0059-Fix-inverted-disabled-in-CraftCrafter-setSlotDisable.patch diff --git a/leaf-server/paper-patches/features/0061-Remove-stream-in-CraftWorld-spawnParticle.patch b/leaf-server/paper-patches/features/0060-Remove-stream-in-CraftWorld-spawnParticle.patch similarity index 100% rename from leaf-server/paper-patches/features/0061-Remove-stream-in-CraftWorld-spawnParticle.patch rename to leaf-server/paper-patches/features/0060-Remove-stream-in-CraftWorld-spawnParticle.patch