From 2d0561db5fc182e60a063e65d36906343451fb08 Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Mon, 26 May 2025 01:19:25 +0800 Subject: [PATCH] [ci skip] Move some useless patches from work to removed --- ...ShreddedPaper-Don-t-block-main-thread-in-Connection-.patch | 1 + ...50-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch | 1 + .../features/0169-Only-tick-items-at-hand.patch | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) rename leaf-archived-patches/{work => removed/hardfork}/server/0124-ShreddedPaper-Don-t-block-main-thread-in-Connection-.patch (94%) rename leaf-archived-patches/{work => removed/legacy}/server/0150-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch (99%) diff --git a/leaf-archived-patches/work/server/0124-ShreddedPaper-Don-t-block-main-thread-in-Connection-.patch b/leaf-archived-patches/removed/hardfork/server/0124-ShreddedPaper-Don-t-block-main-thread-in-Connection-.patch similarity index 94% rename from leaf-archived-patches/work/server/0124-ShreddedPaper-Don-t-block-main-thread-in-Connection-.patch rename to leaf-archived-patches/removed/hardfork/server/0124-ShreddedPaper-Don-t-block-main-thread-in-Connection-.patch index 36b4be10..ffea6692 100644 --- a/leaf-archived-patches/work/server/0124-ShreddedPaper-Don-t-block-main-thread-in-Connection-.patch +++ b/leaf-archived-patches/removed/hardfork/server/0124-ShreddedPaper-Don-t-block-main-thread-in-Connection-.patch @@ -4,6 +4,7 @@ Date: Thu, 1 Aug 2024 00:43:05 +0900 Subject: [PATCH] ShreddedPaper: Don't block main thread in Connection#syncAfterConfigurationChange +Removed since Leaf 1.21.4, replaced by async config switch diff --git a/net/minecraft/network/Connection.java b/net/minecraft/network/Connection.java index 00a82873d226f113278632a53c0faca420dd67d4..5b46036868b6c9d082e35591e58735e16adaae62 100644 diff --git a/leaf-archived-patches/work/server/0150-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch b/leaf-archived-patches/removed/legacy/server/0150-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch similarity index 99% rename from leaf-archived-patches/work/server/0150-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch rename to leaf-archived-patches/removed/legacy/server/0150-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch index 5bd6c56d..fcaba870 100644 --- a/leaf-archived-patches/work/server/0150-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch +++ b/leaf-archived-patches/removed/legacy/server/0150-Use-MCUtil.asyncExecutor-for-MAIN_WORKER_EXECUTOR.patch @@ -3,6 +3,7 @@ From: Taiyou06 Date: Fri, 8 Nov 2024 00:54:42 +0100 Subject: [PATCH] Use MCUtil.asyncExecutor for MAIN_WORKER_EXECUTOR +Removed since Leaf 1.21.3 diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java index 815253d03b85a7a476c1efdeca9496fd64afc137..bb4c9bbebaefe9a0c7d213e9b2b07308e684dc7c 100644 diff --git a/leaf-server/minecraft-patches/features/0169-Only-tick-items-at-hand.patch b/leaf-server/minecraft-patches/features/0169-Only-tick-items-at-hand.patch index 0adbe382..c2f62aee 100644 --- a/leaf-server/minecraft-patches/features/0169-Only-tick-items-at-hand.patch +++ b/leaf-server/minecraft-patches/features/0169-Only-tick-items-at-hand.patch @@ -29,7 +29,7 @@ index 50cf63666071f5d01a85dfc6c6c45c19b05d8ec2..ef53b9f307572dd5dc99d02e017d6b2d if (this.getHealth() != this.lastSentHealth || this.lastSentFood != this.foodData.getFoodLevel() diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java -index 8469cf9cacebea3fdd855f6c3e9e2cf61c78b8ac..d39757fae68580abcb13804e01587e542f1e087d 100644 +index 8469cf9cacebea3fdd855f6c3e9e2cf61c78b8ac..76d85632e1364e71a2aa15dbef41c62422ffd7af 100644 --- a/net/minecraft/world/entity/player/Player.java +++ b/net/minecraft/world/entity/player/Player.java @@ -631,7 +631,14 @@ public abstract class Player extends LivingEntity { @@ -39,7 +39,7 @@ index 8469cf9cacebea3fdd855f6c3e9e2cf61c78b8ac..d39757fae68580abcb13804e01587e54 + // Leaf start - Only tick items at hand + if (org.dreeam.leaf.config.modules.opt.OptimizeItemTicking.onlyTickItemsInHand) { + this.getMainHandItem().inventoryTick(this.level(), this, 0, true); -+ this.getOffhandItem().inventoryTick(this.level(), this, 0, true); ++ this.getOffhandItem().inventoryTick(this.level(), this, 1, true); + } else { this.inventory.tick(); + }