From b16a74c694b6aac5959263afed65dc9411dde4bd Mon Sep 17 00:00:00 2001
From: MC_XiaoHei <xor7xiaohei@gmail.com>
Date: Sun, 31 Aug 2025 11:37:55 +0800
Subject: [PATCH 1/2] feat: remove some features(#724) (#725)

* feat: remove some features(#724)

* feat: remove some features(#724)

* merge master

* fix
---
 ... => 0056-Container-open-passthrough.patch} |  0
 ...0056-Raider-die-skip-self-raid-check.patch | 19 --------------
 ...ont-respond-ping-before-start-fully.patch} |  0
 ... => 0058-Faster-chunk-serialization.patch} |  0
 ...Skip-secondary-POI-sensor-if-absent.patch} |  0
 ...> 0060-Store-mob-counts-in-an-array.patch} |  0
 ...h => 0061-Optimize-noise-generation.patch} |  0
 ...atch => 0062-Optimize-sun-burn-tick.patch} |  0
 ...-Optional-allocation-in-EntityBased.patch} |  0
 ...ignableFrom-call-in-ClassInstanceMu.patch} |  0
 ...ch => 0065-Optimized-CubePointRange.patch} |  0
 ...k-frozen-ticks-before-landing-block.patch} |  2 +-
 ...kip-entity-move-if-movement-is-zero.patch} |  0
 ...8-Skip-cloning-advancement-criteria.patch} |  0
 ...h => 0069-Avoid-anvil-too-expensive.patch} |  0
 ...-fix.patch => 0070-Bow-infinity-fix.patch} |  0
 ...ants.patch => 0071-Zero-tick-plants.patch} |  0
 ...od-API.patch => 0072-Replay-Mod-API.patch} |  2 +-
 ...t.patch => 0073-Leaves-I18n-support.patch} |  0
 ...raft-hopper-not-work-without-player.patch} |  0
 ...G-Fishing.patch => 0075-RNG-Fishing.patch} |  0
 ...r.patch => 0076-Wool-Hopper-Counter.patch} |  2 +-
 ...=> 0077-Spider-jockeys-drop-gapples.patch} |  0
 ...rade.patch => 0078-Force-Void-Trade.patch} |  0
 ...=> 0079-Villager-infinite-discounts.patch} |  0
 ...atch => 0080-CCE-update-suppression.patch} |  0
 ...1-Disable-offline-warn-if-use-proxy.patch} |  0
 ...or-stand-cant-kill-by-mob-projectile.patch | 26 -------------------
 ...atch => 0082-Make-Item-tick-vanilla.patch} |  0
 ...atch => 0083-Copper-Bulb-1-gt-delay.patch} |  0
 ...ay.patch => 0084-Crafter-1-gt-delay.patch} |  0
 ... => 0085-More-Region-Format-Support.patch} |  2 +-
 ...e.patch => 0086-No-TNT-place-update.patch} |  0
 ...tocol.patch => 0087-Servux-Protocol.patch} |  0
 ...ed-hopper-no-longer-send-NC-updates.patch} |  0
 ...e.patch => 0089-Renewable-deepslate.patch} |  0
 ...ges.patch => 0090-Renewable-sponges.patch} |  0
 ...coral.patch => 0091-Renewable-coral.patch} |  0
 ...hopper.patch => 0092-Vanilla-hopper.patch} |  0
 ... => 0093-Old-hopper-suckin-behavior.patch} |  0
 ...-Fix-falling-block-s-block-location.patch} |  0
 ...tebuf-API.patch => 0095-Bytebuf-API.patch} |  0
 ... 0096-Allow-grindstone-overstacking.patch} |  2 +-
 ...67.patch => 0097-Configurable-MC-67.patch} |  0
 ...e-end-gateway-portal-entity-ticking.patch} |  0
 ...able-crystal-portal-proximity-check.patch} |  0
 ...ble-LivingEntity-aiStep-alive-check.patch} |  2 +-
 ...01-Fix-FallingBlockEntity-Duplicate.patch} |  0
 ... => 0102-Old-Block-remove-behaviour.patch} |  4 +--
 ...ior.patch => 0103-Old-raid-behavior.patch} |  2 +-
 ...4-Allow-anvil-destroy-item-entities.patch} |  0
 ...tch => 0105-Disable-vault-blacklist.patch} |  0
 ...106-Fix-EntityPortalExitEvent-logic.patch} |  0
 ... => 0107-Fix-CraftPortalEvent-logic.patch} |  0
 ...ol.patch => 0108-Xaero-Map-Protocol.patch} |  0
 ...ible-planar-movement-multiplication.patch} |  2 +-
 ....patch => 0110-Support-REI-protocol.patch} |  0
 ...=> 0111-Vanilla-player-display-name.patch} |  2 +-
 ... => 0112-Fix-SculkCatalyst-exp-skip.patch} |  2 +-
 ...13-Vanilla-creative-pickup-behavior.patch} |  0
 ...patch => 0114-Vanilla-portal-handle.patch} |  2 +-
 ...h => 0115-Fix-chunk-reload-detector.patch} |  0
 ...not-reset-placed-block-on-exception.patch} |  0
 ...ock-entity-and-entity-crash-at-Leve.patch} |  2 +-
 ... => 0118-Tripwire-behavior-modifier.patch} |  0
 ...tch => 0119-Spawn-invulnerable-time.patch} |  0
 ...ch => 0120-Old-zombie-reinforcement.patch} |  0
 ...ch => 0121-Sound-update-suppression.patch} |  0
 ...122-Old-zombie-piglin-drop-behavior.patch} |  0
 ...b.patch => 0123-Fast-exp-orb-absorb.patch} |  2 +-
 ...patch => 0124-Vanilla-Fluid-Pushing.patch} |  0
 ...0125-Configurable-item-damage-check.patch} |  0
 ...Old-Throwable-Projectile-tick-order.patch} |  0
 ...ld-leash-behavior-when-use-firework.patch} |  0
 ...> 0128-Old-wet-tnt-explode-behavior.patch} |  0
 ...9-Old-projectile-explosion-behavior.patch} |  0
 ...tem-drops-due-to-update-suppression.patch} |  0
 ...ce-desync-due-to-update-suppression.patch} |  0
 ...atch => 0132-TEMP-Merge-Paper-11831.patch} |  0
 ...nder-dragon-part-can-use-end-portal.patch} |  0
 ...134-Configurable-collision-behavior.patch} |  0
 ...tch => 0135-Chat-command-max-length.patch} |  0
 ... 0136-Lithium-Sleeping-Block-Entity.patch} |  0
 ...-Bring-back-LivingEntity-effect-CME.patch} |  2 +-
 ...8-Do-not-tick-Arrow-life-regardless.patch} |  0
 .../org/leavesmc/leaves/LeavesConfig.java     |  6 -----
 86 files changed, 16 insertions(+), 67 deletions(-)
 rename leaves-server/minecraft-patches/features/{0057-Container-open-passthrough.patch => 0056-Container-open-passthrough.patch} (100%)
 delete mode 100644 leaves-server/minecraft-patches/features/0056-Raider-die-skip-self-raid-check.patch
 rename leaves-server/minecraft-patches/features/{0058-Dont-respond-ping-before-start-fully.patch => 0057-Dont-respond-ping-before-start-fully.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0059-Faster-chunk-serialization.patch => 0058-Faster-chunk-serialization.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0060-Skip-secondary-POI-sensor-if-absent.patch => 0059-Skip-secondary-POI-sensor-if-absent.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0061-Store-mob-counts-in-an-array.patch => 0060-Store-mob-counts-in-an-array.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0062-Optimize-noise-generation.patch => 0061-Optimize-noise-generation.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0063-Optimize-sun-burn-tick.patch => 0062-Optimize-sun-burn-tick.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0064-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch => 0063-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0065-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch => 0064-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0066-Optimized-CubePointRange.patch => 0065-Optimized-CubePointRange.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0067-Check-frozen-ticks-before-landing-block.patch => 0066-Check-frozen-ticks-before-landing-block.patch} (93%)
 rename leaves-server/minecraft-patches/features/{0068-Skip-entity-move-if-movement-is-zero.patch => 0067-Skip-entity-move-if-movement-is-zero.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0069-Skip-cloning-advancement-criteria.patch => 0068-Skip-cloning-advancement-criteria.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0070-Avoid-anvil-too-expensive.patch => 0069-Avoid-anvil-too-expensive.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0071-Bow-infinity-fix.patch => 0070-Bow-infinity-fix.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0072-Zero-tick-plants.patch => 0071-Zero-tick-plants.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0073-Replay-Mod-API.patch => 0072-Replay-Mod-API.patch} (99%)
 rename leaves-server/minecraft-patches/features/{0074-Leaves-I18n-support.patch => 0073-Leaves-I18n-support.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0075-Fix-minecraft-hopper-not-work-without-player.patch => 0074-Fix-minecraft-hopper-not-work-without-player.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0076-RNG-Fishing.patch => 0075-RNG-Fishing.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0077-Wool-Hopper-Counter.patch => 0076-Wool-Hopper-Counter.patch} (98%)
 rename leaves-server/minecraft-patches/features/{0078-Spider-jockeys-drop-gapples.patch => 0077-Spider-jockeys-drop-gapples.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0079-Force-Void-Trade.patch => 0078-Force-Void-Trade.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0080-Villager-infinite-discounts.patch => 0079-Villager-infinite-discounts.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0081-CCE-update-suppression.patch => 0080-CCE-update-suppression.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0083-Disable-offline-warn-if-use-proxy.patch => 0081-Disable-offline-warn-if-use-proxy.patch} (100%)
 delete mode 100644 leaves-server/minecraft-patches/features/0082-Armor-stand-cant-kill-by-mob-projectile.patch
 rename leaves-server/minecraft-patches/features/{0084-Make-Item-tick-vanilla.patch => 0082-Make-Item-tick-vanilla.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0085-Copper-Bulb-1-gt-delay.patch => 0083-Copper-Bulb-1-gt-delay.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0086-Crafter-1-gt-delay.patch => 0084-Crafter-1-gt-delay.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0087-More-Region-Format-Support.patch => 0085-More-Region-Format-Support.patch} (99%)
 rename leaves-server/minecraft-patches/features/{0088-No-TNT-place-update.patch => 0086-No-TNT-place-update.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0089-Servux-Protocol.patch => 0087-Servux-Protocol.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0090-Placing-locked-hopper-no-longer-send-NC-updates.patch => 0088-Placing-locked-hopper-no-longer-send-NC-updates.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0091-Renewable-deepslate.patch => 0089-Renewable-deepslate.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0092-Renewable-sponges.patch => 0090-Renewable-sponges.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0093-Renewable-coral.patch => 0091-Renewable-coral.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0094-Vanilla-hopper.patch => 0092-Vanilla-hopper.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0095-Old-hopper-suckin-behavior.patch => 0093-Old-hopper-suckin-behavior.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0096-Fix-falling-block-s-block-location.patch => 0094-Fix-falling-block-s-block-location.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0097-Bytebuf-API.patch => 0095-Bytebuf-API.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0098-Allow-grindstone-overstacking.patch => 0096-Allow-grindstone-overstacking.patch} (99%)
 rename leaves-server/minecraft-patches/features/{0099-Configurable-MC-67.patch => 0097-Configurable-MC-67.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0100-Disable-end-gateway-portal-entity-ticking.patch => 0098-Disable-end-gateway-portal-entity-ticking.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0101-Disable-crystal-portal-proximity-check.patch => 0099-Disable-crystal-portal-proximity-check.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0102-Can-disable-LivingEntity-aiStep-alive-check.patch => 0100-Can-disable-LivingEntity-aiStep-alive-check.patch} (89%)
 rename leaves-server/minecraft-patches/features/{0103-Fix-FallingBlockEntity-Duplicate.patch => 0101-Fix-FallingBlockEntity-Duplicate.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0104-Old-Block-remove-behaviour.patch => 0102-Old-Block-remove-behaviour.patch} (99%)
 rename leaves-server/minecraft-patches/features/{0105-Old-raid-behavior.patch => 0103-Old-raid-behavior.patch} (99%)
 rename leaves-server/minecraft-patches/features/{0106-Allow-anvil-destroy-item-entities.patch => 0104-Allow-anvil-destroy-item-entities.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0107-Disable-vault-blacklist.patch => 0105-Disable-vault-blacklist.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0108-Fix-EntityPortalExitEvent-logic.patch => 0106-Fix-EntityPortalExitEvent-logic.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0109-Fix-CraftPortalEvent-logic.patch => 0107-Fix-CraftPortalEvent-logic.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0110-Xaero-Map-Protocol.patch => 0108-Xaero-Map-Protocol.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0111-Skip-negligible-planar-movement-multiplication.patch => 0109-Skip-negligible-planar-movement-multiplication.patch} (94%)
 rename leaves-server/minecraft-patches/features/{0112-Support-REI-protocol.patch => 0110-Support-REI-protocol.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0113-Vanilla-player-display-name.patch => 0111-Vanilla-player-display-name.patch} (96%)
 rename leaves-server/minecraft-patches/features/{0114-Fix-SculkCatalyst-exp-skip.patch => 0112-Fix-SculkCatalyst-exp-skip.patch} (98%)
 rename leaves-server/minecraft-patches/features/{0115-Vanilla-creative-pickup-behavior.patch => 0113-Vanilla-creative-pickup-behavior.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0116-Vanilla-portal-handle.patch => 0114-Vanilla-portal-handle.patch} (96%)
 rename leaves-server/minecraft-patches/features/{0117-Fix-chunk-reload-detector.patch => 0115-Fix-chunk-reload-detector.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0118-Do-not-reset-placed-block-on-exception.patch => 0116-Do-not-reset-placed-block-on-exception.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0119-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch => 0117-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch} (96%)
 rename leaves-server/minecraft-patches/features/{0120-Tripwire-behavior-modifier.patch => 0118-Tripwire-behavior-modifier.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0121-Spawn-invulnerable-time.patch => 0119-Spawn-invulnerable-time.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0122-Old-zombie-reinforcement.patch => 0120-Old-zombie-reinforcement.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0123-Sound-update-suppression.patch => 0121-Sound-update-suppression.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0124-Old-zombie-piglin-drop-behavior.patch => 0122-Old-zombie-piglin-drop-behavior.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0125-Fast-exp-orb-absorb.patch => 0123-Fast-exp-orb-absorb.patch} (96%)
 rename leaves-server/minecraft-patches/features/{0126-Vanilla-Fluid-Pushing.patch => 0124-Vanilla-Fluid-Pushing.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0127-Configurable-item-damage-check.patch => 0125-Configurable-item-damage-check.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0128-Old-Throwable-Projectile-tick-order.patch => 0126-Old-Throwable-Projectile-tick-order.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0129-Old-leash-behavior-when-use-firework.patch => 0127-Old-leash-behavior-when-use-firework.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0130-Old-wet-tnt-explode-behavior.patch => 0128-Old-wet-tnt-explode-behavior.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0131-Old-projectile-explosion-behavior.patch => 0129-Old-projectile-explosion-behavior.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0132-Prevent-loss-of-item-drops-due-to-update-suppression.patch => 0130-Prevent-loss-of-item-drops-due-to-update-suppression.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0133-Fix-block-place-desync-due-to-update-suppression.patch => 0131-Fix-block-place-desync-due-to-update-suppression.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0134-TEMP-Merge-Paper-11831.patch => 0132-TEMP-Merge-Paper-11831.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0135-Old-ender-dragon-part-can-use-end-portal.patch => 0133-Old-ender-dragon-part-can-use-end-portal.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0136-Configurable-collision-behavior.patch => 0134-Configurable-collision-behavior.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0137-Chat-command-max-length.patch => 0135-Chat-command-max-length.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0138-Lithium-Sleeping-Block-Entity.patch => 0136-Lithium-Sleeping-Block-Entity.patch} (100%)
 rename leaves-server/minecraft-patches/features/{0139-Bring-back-LivingEntity-effect-CME.patch => 0137-Bring-back-LivingEntity-effect-CME.patch} (92%)
 rename leaves-server/minecraft-patches/features/{0140-Do-not-tick-Arrow-life-regardless.patch => 0138-Do-not-tick-Arrow-life-regardless.patch} (100%)

diff --git a/leaves-server/minecraft-patches/features/0057-Container-open-passthrough.patch b/leaves-server/minecraft-patches/features/0056-Container-open-passthrough.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0057-Container-open-passthrough.patch
rename to leaves-server/minecraft-patches/features/0056-Container-open-passthrough.patch
diff --git a/leaves-server/minecraft-patches/features/0056-Raider-die-skip-self-raid-check.patch b/leaves-server/minecraft-patches/features/0056-Raider-die-skip-self-raid-check.patch
deleted file mode 100644
index 839e84f6..00000000
--- a/leaves-server/minecraft-patches/features/0056-Raider-die-skip-self-raid-check.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: violetc <58360096+s-yh-china@users.noreply.github.com>
-Date: Sun, 9 Jul 2023 16:51:47 +0800
-Subject: [PATCH] Raider die skip self raid check
-
-
-diff --git a/net/minecraft/world/entity/raid/Raider.java b/net/minecraft/world/entity/raid/Raider.java
-index a495789b2d21fa9a24d5dca4ecfa196ddce49466..7b697f1dfe8131296ef55cd88a8b9d7cd884eb44 100644
---- a/net/minecraft/world/entity/raid/Raider.java
-+++ b/net/minecraft/world/entity/raid/Raider.java
-@@ -156,7 +156,7 @@ public abstract class Raider extends PatrollingMonster {
-     }
- 
-     public boolean hasRaid() {
--        return this.level() instanceof ServerLevel serverLevel && (this.getCurrentRaid() != null || serverLevel.getRaidAt(this.blockPosition()) != null);
-+        return !org.leavesmc.leaves.LeavesConfig.modify.skipSelfRaidCheck && (this.level() instanceof ServerLevel serverLevel && (this.getCurrentRaid() != null || serverLevel.getRaidAt(this.blockPosition()) != null));  // Leaves - skip self raid check
-     }
- 
-     public boolean hasActiveRaid() {
diff --git a/leaves-server/minecraft-patches/features/0058-Dont-respond-ping-before-start-fully.patch b/leaves-server/minecraft-patches/features/0057-Dont-respond-ping-before-start-fully.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0058-Dont-respond-ping-before-start-fully.patch
rename to leaves-server/minecraft-patches/features/0057-Dont-respond-ping-before-start-fully.patch
diff --git a/leaves-server/minecraft-patches/features/0059-Faster-chunk-serialization.patch b/leaves-server/minecraft-patches/features/0058-Faster-chunk-serialization.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0059-Faster-chunk-serialization.patch
rename to leaves-server/minecraft-patches/features/0058-Faster-chunk-serialization.patch
diff --git a/leaves-server/minecraft-patches/features/0060-Skip-secondary-POI-sensor-if-absent.patch b/leaves-server/minecraft-patches/features/0059-Skip-secondary-POI-sensor-if-absent.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0060-Skip-secondary-POI-sensor-if-absent.patch
rename to leaves-server/minecraft-patches/features/0059-Skip-secondary-POI-sensor-if-absent.patch
diff --git a/leaves-server/minecraft-patches/features/0061-Store-mob-counts-in-an-array.patch b/leaves-server/minecraft-patches/features/0060-Store-mob-counts-in-an-array.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0061-Store-mob-counts-in-an-array.patch
rename to leaves-server/minecraft-patches/features/0060-Store-mob-counts-in-an-array.patch
diff --git a/leaves-server/minecraft-patches/features/0062-Optimize-noise-generation.patch b/leaves-server/minecraft-patches/features/0061-Optimize-noise-generation.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0062-Optimize-noise-generation.patch
rename to leaves-server/minecraft-patches/features/0061-Optimize-noise-generation.patch
diff --git a/leaves-server/minecraft-patches/features/0063-Optimize-sun-burn-tick.patch b/leaves-server/minecraft-patches/features/0062-Optimize-sun-burn-tick.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0063-Optimize-sun-burn-tick.patch
rename to leaves-server/minecraft-patches/features/0062-Optimize-sun-burn-tick.patch
diff --git a/leaves-server/minecraft-patches/features/0064-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch b/leaves-server/minecraft-patches/features/0063-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0064-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
rename to leaves-server/minecraft-patches/features/0063-Reduce-lambda-and-Optional-allocation-in-EntityBased.patch
diff --git a/leaves-server/minecraft-patches/features/0065-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch b/leaves-server/minecraft-patches/features/0064-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0065-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
rename to leaves-server/minecraft-patches/features/0064-Avoid-Class-isAssignableFrom-call-in-ClassInstanceMu.patch
diff --git a/leaves-server/minecraft-patches/features/0066-Optimized-CubePointRange.patch b/leaves-server/minecraft-patches/features/0065-Optimized-CubePointRange.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0066-Optimized-CubePointRange.patch
rename to leaves-server/minecraft-patches/features/0065-Optimized-CubePointRange.patch
diff --git a/leaves-server/minecraft-patches/features/0067-Check-frozen-ticks-before-landing-block.patch b/leaves-server/minecraft-patches/features/0066-Check-frozen-ticks-before-landing-block.patch
similarity index 93%
rename from leaves-server/minecraft-patches/features/0067-Check-frozen-ticks-before-landing-block.patch
rename to leaves-server/minecraft-patches/features/0066-Check-frozen-ticks-before-landing-block.patch
index 8a6bb147..3ab6b524 100644
--- a/leaves-server/minecraft-patches/features/0067-Check-frozen-ticks-before-landing-block.patch
+++ b/leaves-server/minecraft-patches/features/0066-Check-frozen-ticks-before-landing-block.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Check frozen ticks before landing block
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index c25cdcebfdd2697da927d55420ab9f02bd4c792a..305c099d32f1472a6e8909cdf2a53cec8a31afb5 100644
+index 9c85639394826f7e683d67e53c1be8cdf9369a78..1bf4cda041189aa5ac67be4a1bda312620788388 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -537,10 +537,10 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
diff --git a/leaves-server/minecraft-patches/features/0068-Skip-entity-move-if-movement-is-zero.patch b/leaves-server/minecraft-patches/features/0067-Skip-entity-move-if-movement-is-zero.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0068-Skip-entity-move-if-movement-is-zero.patch
rename to leaves-server/minecraft-patches/features/0067-Skip-entity-move-if-movement-is-zero.patch
diff --git a/leaves-server/minecraft-patches/features/0069-Skip-cloning-advancement-criteria.patch b/leaves-server/minecraft-patches/features/0068-Skip-cloning-advancement-criteria.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0069-Skip-cloning-advancement-criteria.patch
rename to leaves-server/minecraft-patches/features/0068-Skip-cloning-advancement-criteria.patch
diff --git a/leaves-server/minecraft-patches/features/0070-Avoid-anvil-too-expensive.patch b/leaves-server/minecraft-patches/features/0069-Avoid-anvil-too-expensive.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0070-Avoid-anvil-too-expensive.patch
rename to leaves-server/minecraft-patches/features/0069-Avoid-anvil-too-expensive.patch
diff --git a/leaves-server/minecraft-patches/features/0071-Bow-infinity-fix.patch b/leaves-server/minecraft-patches/features/0070-Bow-infinity-fix.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0071-Bow-infinity-fix.patch
rename to leaves-server/minecraft-patches/features/0070-Bow-infinity-fix.patch
diff --git a/leaves-server/minecraft-patches/features/0072-Zero-tick-plants.patch b/leaves-server/minecraft-patches/features/0071-Zero-tick-plants.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0072-Zero-tick-plants.patch
rename to leaves-server/minecraft-patches/features/0071-Zero-tick-plants.patch
diff --git a/leaves-server/minecraft-patches/features/0073-Replay-Mod-API.patch b/leaves-server/minecraft-patches/features/0072-Replay-Mod-API.patch
similarity index 99%
rename from leaves-server/minecraft-patches/features/0073-Replay-Mod-API.patch
rename to leaves-server/minecraft-patches/features/0072-Replay-Mod-API.patch
index d0ef7acf..67a4d107 100644
--- a/leaves-server/minecraft-patches/features/0073-Replay-Mod-API.patch
+++ b/leaves-server/minecraft-patches/features/0072-Replay-Mod-API.patch
@@ -181,7 +181,7 @@ index c6ae34f91b3629990294fc5e69237a1e600ef038..2109b0a2d4099e64c34cd1c45b83f726
              org.bukkit.entity.Player sender = (org.bukkit.entity.Player) source.getBukkitSender();
              playersTemp = playersTemp.stream().filter((ep) -> sender.canSee(ep.getBukkitEntity())).collect(java.util.stream.Collectors.toList());
 diff --git a/net/minecraft/server/commands/OpCommand.java b/net/minecraft/server/commands/OpCommand.java
-index f2286b96b8f40b4588f817913c42ae7b4a92340f..dbe6c37642d35ac6ee8b428cf1e45878a5dfa9da 100644
+index e6c7bbb023000b9de90c1256274ff5aba4a6478a..98f8804d58616592332e2a968282be6ad8903ea8 100644
 --- a/net/minecraft/server/commands/OpCommand.java
 +++ b/net/minecraft/server/commands/OpCommand.java
 @@ -25,7 +25,7 @@ public class OpCommand {
diff --git a/leaves-server/minecraft-patches/features/0074-Leaves-I18n-support.patch b/leaves-server/minecraft-patches/features/0073-Leaves-I18n-support.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0074-Leaves-I18n-support.patch
rename to leaves-server/minecraft-patches/features/0073-Leaves-I18n-support.patch
diff --git a/leaves-server/minecraft-patches/features/0075-Fix-minecraft-hopper-not-work-without-player.patch b/leaves-server/minecraft-patches/features/0074-Fix-minecraft-hopper-not-work-without-player.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0075-Fix-minecraft-hopper-not-work-without-player.patch
rename to leaves-server/minecraft-patches/features/0074-Fix-minecraft-hopper-not-work-without-player.patch
diff --git a/leaves-server/minecraft-patches/features/0076-RNG-Fishing.patch b/leaves-server/minecraft-patches/features/0075-RNG-Fishing.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0076-RNG-Fishing.patch
rename to leaves-server/minecraft-patches/features/0075-RNG-Fishing.patch
diff --git a/leaves-server/minecraft-patches/features/0077-Wool-Hopper-Counter.patch b/leaves-server/minecraft-patches/features/0076-Wool-Hopper-Counter.patch
similarity index 98%
rename from leaves-server/minecraft-patches/features/0077-Wool-Hopper-Counter.patch
rename to leaves-server/minecraft-patches/features/0076-Wool-Hopper-Counter.patch
index 579735ea..f6919b78 100644
--- a/leaves-server/minecraft-patches/features/0077-Wool-Hopper-Counter.patch
+++ b/leaves-server/minecraft-patches/features/0076-Wool-Hopper-Counter.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Wool Hopper Counter
 This patch is Powered by fabric-carpet(https://github.com/gnembon/fabric-carpet)
 
 diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index d152ad88e8e873a0164b2394516bd10f23c7b263..f1388ad51b7549e881cae36a5a9bcd4229442f3e 100644
+index 6dfdd4853d084f63285a7de3db49a245004c4fa5..3145b6ee853f720c5c201f5dd464645eb039100c 100644
 --- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 @@ -205,8 +205,30 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
diff --git a/leaves-server/minecraft-patches/features/0078-Spider-jockeys-drop-gapples.patch b/leaves-server/minecraft-patches/features/0077-Spider-jockeys-drop-gapples.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0078-Spider-jockeys-drop-gapples.patch
rename to leaves-server/minecraft-patches/features/0077-Spider-jockeys-drop-gapples.patch
diff --git a/leaves-server/minecraft-patches/features/0079-Force-Void-Trade.patch b/leaves-server/minecraft-patches/features/0078-Force-Void-Trade.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0079-Force-Void-Trade.patch
rename to leaves-server/minecraft-patches/features/0078-Force-Void-Trade.patch
diff --git a/leaves-server/minecraft-patches/features/0080-Villager-infinite-discounts.patch b/leaves-server/minecraft-patches/features/0079-Villager-infinite-discounts.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0080-Villager-infinite-discounts.patch
rename to leaves-server/minecraft-patches/features/0079-Villager-infinite-discounts.patch
diff --git a/leaves-server/minecraft-patches/features/0081-CCE-update-suppression.patch b/leaves-server/minecraft-patches/features/0080-CCE-update-suppression.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0081-CCE-update-suppression.patch
rename to leaves-server/minecraft-patches/features/0080-CCE-update-suppression.patch
diff --git a/leaves-server/minecraft-patches/features/0083-Disable-offline-warn-if-use-proxy.patch b/leaves-server/minecraft-patches/features/0081-Disable-offline-warn-if-use-proxy.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0083-Disable-offline-warn-if-use-proxy.patch
rename to leaves-server/minecraft-patches/features/0081-Disable-offline-warn-if-use-proxy.patch
diff --git a/leaves-server/minecraft-patches/features/0082-Armor-stand-cant-kill-by-mob-projectile.patch b/leaves-server/minecraft-patches/features/0082-Armor-stand-cant-kill-by-mob-projectile.patch
deleted file mode 100644
index 60977a4e..00000000
--- a/leaves-server/minecraft-patches/features/0082-Armor-stand-cant-kill-by-mob-projectile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: violetc <58360096+s-yh-china@users.noreply.github.com>
-Date: Fri, 29 Sep 2023 10:39:36 +0800
-Subject: [PATCH] Armor stand cant kill by mob projectile
-
-
-diff --git a/net/minecraft/world/entity/decoration/ArmorStand.java b/net/minecraft/world/entity/decoration/ArmorStand.java
-index d7725b5ca689e3d5b512baab04e113be77c0b2ee..39b056d73bbdd06ba5cdb5368efcbcc128dc79ae 100644
---- a/net/minecraft/world/entity/decoration/ArmorStand.java
-+++ b/net/minecraft/world/entity/decoration/ArmorStand.java
-@@ -372,6 +372,15 @@ public class ArmorStand extends LivingEntity {
-             // CraftBukkit end
-             boolean isCanBreakArmorStand = damageSource.is(DamageTypeTags.CAN_BREAK_ARMOR_STAND);
-             boolean isAlwaysKillsArmorStands = damageSource.is(DamageTypeTags.ALWAYS_KILLS_ARMOR_STANDS);
-+
-+            // Leaves start - Armor stand cant kill by mob projectile
-+            if (org.leavesmc.leaves.LeavesConfig.modify.oldMC.armorStandCantKillByMobProjectile) {
-+                if (damageSource.getDirectEntity() instanceof net.minecraft.world.entity.projectile.Projectile projectile && !(projectile.getOwner() instanceof Player)) {
-+                    return false;
-+                }
-+            }
-+            // Leaves end - Armor stand cant kill by mob projectile
-+
-             if (!isCanBreakArmorStand && !isAlwaysKillsArmorStands) {
-                 return false;
-             } else if (damageSource.getEntity() instanceof Player player && !player.getAbilities().mayBuild) {
diff --git a/leaves-server/minecraft-patches/features/0084-Make-Item-tick-vanilla.patch b/leaves-server/minecraft-patches/features/0082-Make-Item-tick-vanilla.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0084-Make-Item-tick-vanilla.patch
rename to leaves-server/minecraft-patches/features/0082-Make-Item-tick-vanilla.patch
diff --git a/leaves-server/minecraft-patches/features/0085-Copper-Bulb-1-gt-delay.patch b/leaves-server/minecraft-patches/features/0083-Copper-Bulb-1-gt-delay.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0085-Copper-Bulb-1-gt-delay.patch
rename to leaves-server/minecraft-patches/features/0083-Copper-Bulb-1-gt-delay.patch
diff --git a/leaves-server/minecraft-patches/features/0086-Crafter-1-gt-delay.patch b/leaves-server/minecraft-patches/features/0084-Crafter-1-gt-delay.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0086-Crafter-1-gt-delay.patch
rename to leaves-server/minecraft-patches/features/0084-Crafter-1-gt-delay.patch
diff --git a/leaves-server/minecraft-patches/features/0087-More-Region-Format-Support.patch b/leaves-server/minecraft-patches/features/0085-More-Region-Format-Support.patch
similarity index 99%
rename from leaves-server/minecraft-patches/features/0087-More-Region-Format-Support.patch
rename to leaves-server/minecraft-patches/features/0085-More-Region-Format-Support.patch
index 4beb95dd..426105c3 100644
--- a/leaves-server/minecraft-patches/features/0087-More-Region-Format-Support.patch
+++ b/leaves-server/minecraft-patches/features/0085-More-Region-Format-Support.patch
@@ -54,7 +54,7 @@ index 51c126735ace8fdde89ad97b5cab62f244212db0..a6573e327ace16b7ea320eb1440ffcbc
 +    public void moonrise$write(final org.leavesmc.leaves.region.IRegionFile regionFile) throws IOException; // Leaves - more region format
  }
 diff --git a/net/minecraft/server/MinecraftServer.java b/net/minecraft/server/MinecraftServer.java
-index 25087f470db918dbca3ec582581d02822e5ff17d..7813085bec9f4b3a88ed2394ddc781ad7cf72439 100644
+index 1241b008d66bacd8640302a6dbf52a2e592b29b9..0172b4f0c3d5753a3a3d8ccfe591c09328216e48 100644
 --- a/net/minecraft/server/MinecraftServer.java
 +++ b/net/minecraft/server/MinecraftServer.java
 @@ -944,10 +944,10 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
diff --git a/leaves-server/minecraft-patches/features/0088-No-TNT-place-update.patch b/leaves-server/minecraft-patches/features/0086-No-TNT-place-update.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0088-No-TNT-place-update.patch
rename to leaves-server/minecraft-patches/features/0086-No-TNT-place-update.patch
diff --git a/leaves-server/minecraft-patches/features/0089-Servux-Protocol.patch b/leaves-server/minecraft-patches/features/0087-Servux-Protocol.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0089-Servux-Protocol.patch
rename to leaves-server/minecraft-patches/features/0087-Servux-Protocol.patch
diff --git a/leaves-server/minecraft-patches/features/0090-Placing-locked-hopper-no-longer-send-NC-updates.patch b/leaves-server/minecraft-patches/features/0088-Placing-locked-hopper-no-longer-send-NC-updates.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0090-Placing-locked-hopper-no-longer-send-NC-updates.patch
rename to leaves-server/minecraft-patches/features/0088-Placing-locked-hopper-no-longer-send-NC-updates.patch
diff --git a/leaves-server/minecraft-patches/features/0091-Renewable-deepslate.patch b/leaves-server/minecraft-patches/features/0089-Renewable-deepslate.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0091-Renewable-deepslate.patch
rename to leaves-server/minecraft-patches/features/0089-Renewable-deepslate.patch
diff --git a/leaves-server/minecraft-patches/features/0092-Renewable-sponges.patch b/leaves-server/minecraft-patches/features/0090-Renewable-sponges.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0092-Renewable-sponges.patch
rename to leaves-server/minecraft-patches/features/0090-Renewable-sponges.patch
diff --git a/leaves-server/minecraft-patches/features/0093-Renewable-coral.patch b/leaves-server/minecraft-patches/features/0091-Renewable-coral.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0093-Renewable-coral.patch
rename to leaves-server/minecraft-patches/features/0091-Renewable-coral.patch
diff --git a/leaves-server/minecraft-patches/features/0094-Vanilla-hopper.patch b/leaves-server/minecraft-patches/features/0092-Vanilla-hopper.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0094-Vanilla-hopper.patch
rename to leaves-server/minecraft-patches/features/0092-Vanilla-hopper.patch
diff --git a/leaves-server/minecraft-patches/features/0095-Old-hopper-suckin-behavior.patch b/leaves-server/minecraft-patches/features/0093-Old-hopper-suckin-behavior.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0095-Old-hopper-suckin-behavior.patch
rename to leaves-server/minecraft-patches/features/0093-Old-hopper-suckin-behavior.patch
diff --git a/leaves-server/minecraft-patches/features/0096-Fix-falling-block-s-block-location.patch b/leaves-server/minecraft-patches/features/0094-Fix-falling-block-s-block-location.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0096-Fix-falling-block-s-block-location.patch
rename to leaves-server/minecraft-patches/features/0094-Fix-falling-block-s-block-location.patch
diff --git a/leaves-server/minecraft-patches/features/0097-Bytebuf-API.patch b/leaves-server/minecraft-patches/features/0095-Bytebuf-API.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0097-Bytebuf-API.patch
rename to leaves-server/minecraft-patches/features/0095-Bytebuf-API.patch
diff --git a/leaves-server/minecraft-patches/features/0098-Allow-grindstone-overstacking.patch b/leaves-server/minecraft-patches/features/0096-Allow-grindstone-overstacking.patch
similarity index 99%
rename from leaves-server/minecraft-patches/features/0098-Allow-grindstone-overstacking.patch
rename to leaves-server/minecraft-patches/features/0096-Allow-grindstone-overstacking.patch
index 8fb7fcff..3b0f8c09 100644
--- a/leaves-server/minecraft-patches/features/0098-Allow-grindstone-overstacking.patch
+++ b/leaves-server/minecraft-patches/features/0096-Allow-grindstone-overstacking.patch
@@ -147,7 +147,7 @@ index 63d6a43dab067aa4c8fb67095c455130196eef9f..561acadcf81dc219d88e8ec8bdbd4f5f
          this.setChanged();
      }
 diff --git a/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index f6df4c049ed3460eb437a4637c122a5880f2bdbc..d8eede6272ee712c81ed9429539837fdbd27bfcd 100644
+index 4dca615d263f1b0dacf574cfaa00ea23abee2714..d9969741bb8efbf83df51692ebcd12e3d77c10f6 100644
 --- a/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 @@ -113,6 +113,11 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen
diff --git a/leaves-server/minecraft-patches/features/0099-Configurable-MC-67.patch b/leaves-server/minecraft-patches/features/0097-Configurable-MC-67.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0099-Configurable-MC-67.patch
rename to leaves-server/minecraft-patches/features/0097-Configurable-MC-67.patch
diff --git a/leaves-server/minecraft-patches/features/0100-Disable-end-gateway-portal-entity-ticking.patch b/leaves-server/minecraft-patches/features/0098-Disable-end-gateway-portal-entity-ticking.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0100-Disable-end-gateway-portal-entity-ticking.patch
rename to leaves-server/minecraft-patches/features/0098-Disable-end-gateway-portal-entity-ticking.patch
diff --git a/leaves-server/minecraft-patches/features/0101-Disable-crystal-portal-proximity-check.patch b/leaves-server/minecraft-patches/features/0099-Disable-crystal-portal-proximity-check.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0101-Disable-crystal-portal-proximity-check.patch
rename to leaves-server/minecraft-patches/features/0099-Disable-crystal-portal-proximity-check.patch
diff --git a/leaves-server/minecraft-patches/features/0102-Can-disable-LivingEntity-aiStep-alive-check.patch b/leaves-server/minecraft-patches/features/0100-Can-disable-LivingEntity-aiStep-alive-check.patch
similarity index 89%
rename from leaves-server/minecraft-patches/features/0102-Can-disable-LivingEntity-aiStep-alive-check.patch
rename to leaves-server/minecraft-patches/features/0100-Can-disable-LivingEntity-aiStep-alive-check.patch
index 5a4ee6dd..cebbf6c0 100644
--- a/leaves-server/minecraft-patches/features/0102-Can-disable-LivingEntity-aiStep-alive-check.patch
+++ b/leaves-server/minecraft-patches/features/0100-Can-disable-LivingEntity-aiStep-alive-check.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Can disable LivingEntity aiStep alive check
 
 
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 67e63375db357a95e3854c8e77e0de15d925dfea..2cc5c081a75997be637fe753ccdd222e862170c0 100644
+index 1bf4cda041189aa5ac67be4a1bda312620788388..59a352427b8d6445f3da3c6033bae4826277ed60 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -3285,7 +3285,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
diff --git a/leaves-server/minecraft-patches/features/0103-Fix-FallingBlockEntity-Duplicate.patch b/leaves-server/minecraft-patches/features/0101-Fix-FallingBlockEntity-Duplicate.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0103-Fix-FallingBlockEntity-Duplicate.patch
rename to leaves-server/minecraft-patches/features/0101-Fix-FallingBlockEntity-Duplicate.patch
diff --git a/leaves-server/minecraft-patches/features/0104-Old-Block-remove-behaviour.patch b/leaves-server/minecraft-patches/features/0102-Old-Block-remove-behaviour.patch
similarity index 99%
rename from leaves-server/minecraft-patches/features/0104-Old-Block-remove-behaviour.patch
rename to leaves-server/minecraft-patches/features/0102-Old-Block-remove-behaviour.patch
index 5bc792eb..51199039 100644
--- a/leaves-server/minecraft-patches/features/0104-Old-Block-remove-behaviour.patch
+++ b/leaves-server/minecraft-patches/features/0102-Old-Block-remove-behaviour.patch
@@ -594,7 +594,7 @@ index 757f8453e147875ab9f14d9726bb734ef27447c9..d0558d0e33f3d6e25af2dd71650d723e
      protected void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
          if (state.getValue(SHRIEKING)) {
 diff --git a/net/minecraft/world/level/block/ShulkerBoxBlock.java b/net/minecraft/world/level/block/ShulkerBoxBlock.java
-index c34318fdc454ea31655c3c3aa5dbedd3d922ee24..8a5f70778b550cd470b7225e74c6c87a6ec6e7e5 100644
+index 45e48e6d225a2741cd615345711072610d728474..80520260ccb52935f3c1564c2f161bb148ba7baa 100644
 --- a/net/minecraft/world/level/block/ShulkerBoxBlock.java
 +++ b/net/minecraft/world/level/block/ShulkerBoxBlock.java
 @@ -152,6 +152,19 @@ public class ShulkerBoxBlock extends BaseEntityBlock {
@@ -762,7 +762,7 @@ index be66f0f1cb1b0bcec8f9489a1fdd8777df1adb6b..67719dce9017a4c86a70b62fb660bddc
              this.getBlock().affectNeighborsAfterRemoval(this.asState(), level, pos, movedByPiston);
          }
 diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java
-index 2cdca2917ce6a4912b57594697bf5543801eb868..d0d78d35c87973629dcd83b22ac0435a7498fe00 100644
+index 0e22116fefcbdbf2049b7ec285b35fd03c723dc5..45386818312fbd99bbcb72d14ad9e54cd864a2a8 100644
 --- a/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -396,20 +396,26 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
diff --git a/leaves-server/minecraft-patches/features/0105-Old-raid-behavior.patch b/leaves-server/minecraft-patches/features/0103-Old-raid-behavior.patch
similarity index 99%
rename from leaves-server/minecraft-patches/features/0105-Old-raid-behavior.patch
rename to leaves-server/minecraft-patches/features/0103-Old-raid-behavior.patch
index 7c442062..7eadfbcf 100644
--- a/leaves-server/minecraft-patches/features/0105-Old-raid-behavior.patch
+++ b/leaves-server/minecraft-patches/features/0103-Old-raid-behavior.patch
@@ -164,7 +164,7 @@ index b3a29ce523fb5de71589c7c17598bba17622f988..8f90f3234c9b80b7a194d5dbffd8ea93
 +    // Leaves end - old FindSpawnPosition
  }
 diff --git a/net/minecraft/world/entity/raid/Raider.java b/net/minecraft/world/entity/raid/Raider.java
-index 7b697f1dfe8131296ef55cd88a8b9d7cd884eb44..0e9cfb43d6620790f04b8a85e75308a306ec4ea5 100644
+index a495789b2d21fa9a24d5dca4ecfa196ddce49466..86e8ca07a1163094b14c55fe8913c7312eeff124 100644
 --- a/net/minecraft/world/entity/raid/Raider.java
 +++ b/net/minecraft/world/entity/raid/Raider.java
 @@ -128,6 +128,43 @@ public abstract class Raider extends PatrollingMonster {
diff --git a/leaves-server/minecraft-patches/features/0106-Allow-anvil-destroy-item-entities.patch b/leaves-server/minecraft-patches/features/0104-Allow-anvil-destroy-item-entities.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0106-Allow-anvil-destroy-item-entities.patch
rename to leaves-server/minecraft-patches/features/0104-Allow-anvil-destroy-item-entities.patch
diff --git a/leaves-server/minecraft-patches/features/0107-Disable-vault-blacklist.patch b/leaves-server/minecraft-patches/features/0105-Disable-vault-blacklist.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0107-Disable-vault-blacklist.patch
rename to leaves-server/minecraft-patches/features/0105-Disable-vault-blacklist.patch
diff --git a/leaves-server/minecraft-patches/features/0108-Fix-EntityPortalExitEvent-logic.patch b/leaves-server/minecraft-patches/features/0106-Fix-EntityPortalExitEvent-logic.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0108-Fix-EntityPortalExitEvent-logic.patch
rename to leaves-server/minecraft-patches/features/0106-Fix-EntityPortalExitEvent-logic.patch
diff --git a/leaves-server/minecraft-patches/features/0109-Fix-CraftPortalEvent-logic.patch b/leaves-server/minecraft-patches/features/0107-Fix-CraftPortalEvent-logic.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0109-Fix-CraftPortalEvent-logic.patch
rename to leaves-server/minecraft-patches/features/0107-Fix-CraftPortalEvent-logic.patch
diff --git a/leaves-server/minecraft-patches/features/0110-Xaero-Map-Protocol.patch b/leaves-server/minecraft-patches/features/0108-Xaero-Map-Protocol.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0110-Xaero-Map-Protocol.patch
rename to leaves-server/minecraft-patches/features/0108-Xaero-Map-Protocol.patch
diff --git a/leaves-server/minecraft-patches/features/0111-Skip-negligible-planar-movement-multiplication.patch b/leaves-server/minecraft-patches/features/0109-Skip-negligible-planar-movement-multiplication.patch
similarity index 94%
rename from leaves-server/minecraft-patches/features/0111-Skip-negligible-planar-movement-multiplication.patch
rename to leaves-server/minecraft-patches/features/0109-Skip-negligible-planar-movement-multiplication.patch
index cd9989ca..536ea9d6 100644
--- a/leaves-server/minecraft-patches/features/0111-Skip-negligible-planar-movement-multiplication.patch
+++ b/leaves-server/minecraft-patches/features/0109-Skip-negligible-planar-movement-multiplication.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Skip negligible planar movement multiplication
 This patch is Powered by Gale(https://github.com/Dreeam-qwq/Gale)
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index 87767c14cf6bed351a7ef9fe578be34a3643fea2..a556618dd51927a15c309bc3a2367c9a05a8e3af 100644
+index 9309ef573407cbdf6bb1859021939798bbcf4669..d7eea7b8b5836b4aba510cfbbdb3788cf21c2abc 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -1234,8 +1234,17 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/leaves-server/minecraft-patches/features/0112-Support-REI-protocol.patch b/leaves-server/minecraft-patches/features/0110-Support-REI-protocol.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0112-Support-REI-protocol.patch
rename to leaves-server/minecraft-patches/features/0110-Support-REI-protocol.patch
diff --git a/leaves-server/minecraft-patches/features/0113-Vanilla-player-display-name.patch b/leaves-server/minecraft-patches/features/0111-Vanilla-player-display-name.patch
similarity index 96%
rename from leaves-server/minecraft-patches/features/0113-Vanilla-player-display-name.patch
rename to leaves-server/minecraft-patches/features/0111-Vanilla-player-display-name.patch
index e442a605..deddd91f 100644
--- a/leaves-server/minecraft-patches/features/0113-Vanilla-player-display-name.patch
+++ b/leaves-server/minecraft-patches/features/0111-Vanilla-player-display-name.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Vanilla player display name
 
 
 diff --git a/net/minecraft/server/level/ServerPlayer.java b/net/minecraft/server/level/ServerPlayer.java
-index e9e98636f4e8665fb83d726a701e5d99ba3b992d..b10ae364db96856007ca2fdd37124c77a1f3df14 100644
+index e355939e153c05f9434482c4713743755b280d69..76af3083d6f4c308802be7b8625d905105c3355c 100644
 --- a/net/minecraft/server/level/ServerPlayer.java
 +++ b/net/minecraft/server/level/ServerPlayer.java
 @@ -476,7 +476,7 @@ public class ServerPlayer extends Player implements ca.spottedleaf.moonrise.patc
diff --git a/leaves-server/minecraft-patches/features/0114-Fix-SculkCatalyst-exp-skip.patch b/leaves-server/minecraft-patches/features/0112-Fix-SculkCatalyst-exp-skip.patch
similarity index 98%
rename from leaves-server/minecraft-patches/features/0114-Fix-SculkCatalyst-exp-skip.patch
rename to leaves-server/minecraft-patches/features/0112-Fix-SculkCatalyst-exp-skip.patch
index 195cceab..4aa115b5 100644
--- a/leaves-server/minecraft-patches/features/0114-Fix-SculkCatalyst-exp-skip.patch
+++ b/leaves-server/minecraft-patches/features/0112-Fix-SculkCatalyst-exp-skip.patch
@@ -34,7 +34,7 @@ index 76af3083d6f4c308802be7b8625d905105c3355c..531b38be36cb2990cf5fbefbd58f917a
          AABB aabb = new AABB(this.blockPosition()).inflate(32.0, 10.0, 32.0);
          this.level()
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 2cc5c081a75997be637fe753ccdd222e862170c0..e3673ababa41a4d65b87adbc6d79d53a196564b7 100644
+index 59a352427b8d6445f3da3c6033bae4826277ed60..6b776ff621275e842c113000bd69528c96a598c3 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -277,6 +277,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
diff --git a/leaves-server/minecraft-patches/features/0115-Vanilla-creative-pickup-behavior.patch b/leaves-server/minecraft-patches/features/0113-Vanilla-creative-pickup-behavior.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0115-Vanilla-creative-pickup-behavior.patch
rename to leaves-server/minecraft-patches/features/0113-Vanilla-creative-pickup-behavior.patch
diff --git a/leaves-server/minecraft-patches/features/0116-Vanilla-portal-handle.patch b/leaves-server/minecraft-patches/features/0114-Vanilla-portal-handle.patch
similarity index 96%
rename from leaves-server/minecraft-patches/features/0116-Vanilla-portal-handle.patch
rename to leaves-server/minecraft-patches/features/0114-Vanilla-portal-handle.patch
index ca375012..204710f8 100644
--- a/leaves-server/minecraft-patches/features/0116-Vanilla-portal-handle.patch
+++ b/leaves-server/minecraft-patches/features/0114-Vanilla-portal-handle.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Vanilla portal handle
 
 
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index a556618dd51927a15c309bc3a2367c9a05a8e3af..fadce8b3073dc67534a4830b40fc2e84fdbd687b 100644
+index d7eea7b8b5836b4aba510cfbbdb3788cf21c2abc..c011fd65f5814c88cb3f6a4f62283efb9b6188ec 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
 @@ -836,6 +836,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
diff --git a/leaves-server/minecraft-patches/features/0117-Fix-chunk-reload-detector.patch b/leaves-server/minecraft-patches/features/0115-Fix-chunk-reload-detector.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0117-Fix-chunk-reload-detector.patch
rename to leaves-server/minecraft-patches/features/0115-Fix-chunk-reload-detector.patch
diff --git a/leaves-server/minecraft-patches/features/0118-Do-not-reset-placed-block-on-exception.patch b/leaves-server/minecraft-patches/features/0116-Do-not-reset-placed-block-on-exception.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0118-Do-not-reset-placed-block-on-exception.patch
rename to leaves-server/minecraft-patches/features/0116-Do-not-reset-placed-block-on-exception.patch
diff --git a/leaves-server/minecraft-patches/features/0119-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch b/leaves-server/minecraft-patches/features/0117-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch
similarity index 96%
rename from leaves-server/minecraft-patches/features/0119-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch
rename to leaves-server/minecraft-patches/features/0117-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch
index bb5f210f..9621ebab 100644
--- a/leaves-server/minecraft-patches/features/0119-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch
+++ b/leaves-server/minecraft-patches/features/0117-Do-not-prevent-block-entity-and-entity-crash-at-Leve.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Do not prevent block entity and entity crash at LevelChunk
 
 
 diff --git a/net/minecraft/world/level/chunk/LevelChunk.java b/net/minecraft/world/level/chunk/LevelChunk.java
-index d0d78d35c87973629dcd83b22ac0435a7498fe00..56e7df059cd070a8f472d6712dfb08d14ffa8819 100644
+index 45386818312fbd99bbcb72d14ad9e54cd864a2a8..b27cbb55fcb980679819a605112533f366abc97e 100644
 --- a/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -952,12 +952,14 @@ public class LevelChunk extends ChunkAccess implements ca.spottedleaf.moonrise.p
diff --git a/leaves-server/minecraft-patches/features/0120-Tripwire-behavior-modifier.patch b/leaves-server/minecraft-patches/features/0118-Tripwire-behavior-modifier.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0120-Tripwire-behavior-modifier.patch
rename to leaves-server/minecraft-patches/features/0118-Tripwire-behavior-modifier.patch
diff --git a/leaves-server/minecraft-patches/features/0121-Spawn-invulnerable-time.patch b/leaves-server/minecraft-patches/features/0119-Spawn-invulnerable-time.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0121-Spawn-invulnerable-time.patch
rename to leaves-server/minecraft-patches/features/0119-Spawn-invulnerable-time.patch
diff --git a/leaves-server/minecraft-patches/features/0122-Old-zombie-reinforcement.patch b/leaves-server/minecraft-patches/features/0120-Old-zombie-reinforcement.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0122-Old-zombie-reinforcement.patch
rename to leaves-server/minecraft-patches/features/0120-Old-zombie-reinforcement.patch
diff --git a/leaves-server/minecraft-patches/features/0123-Sound-update-suppression.patch b/leaves-server/minecraft-patches/features/0121-Sound-update-suppression.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0123-Sound-update-suppression.patch
rename to leaves-server/minecraft-patches/features/0121-Sound-update-suppression.patch
diff --git a/leaves-server/minecraft-patches/features/0124-Old-zombie-piglin-drop-behavior.patch b/leaves-server/minecraft-patches/features/0122-Old-zombie-piglin-drop-behavior.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0124-Old-zombie-piglin-drop-behavior.patch
rename to leaves-server/minecraft-patches/features/0122-Old-zombie-piglin-drop-behavior.patch
diff --git a/leaves-server/minecraft-patches/features/0125-Fast-exp-orb-absorb.patch b/leaves-server/minecraft-patches/features/0123-Fast-exp-orb-absorb.patch
similarity index 96%
rename from leaves-server/minecraft-patches/features/0125-Fast-exp-orb-absorb.patch
rename to leaves-server/minecraft-patches/features/0123-Fast-exp-orb-absorb.patch
index 377e34c3..4959f922 100644
--- a/leaves-server/minecraft-patches/features/0125-Fast-exp-orb-absorb.patch
+++ b/leaves-server/minecraft-patches/features/0123-Fast-exp-orb-absorb.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fast exp orb absorb
 
 
 diff --git a/net/minecraft/world/entity/ExperienceOrb.java b/net/minecraft/world/entity/ExperienceOrb.java
-index a62edee768c30c99213baa6bd736d67ae52b558c..82fb285f53513cc62f8f7b78b85a91076c73545a 100644
+index cfd9d63f55e73c1777055d13a802b29e151cc0d4..36e691f511c37b8af3f7fc58d9986fefdc3e1e5a 100644
 --- a/net/minecraft/world/entity/ExperienceOrb.java
 +++ b/net/minecraft/world/entity/ExperienceOrb.java
 @@ -358,6 +358,20 @@ public class ExperienceOrb extends Entity {
diff --git a/leaves-server/minecraft-patches/features/0126-Vanilla-Fluid-Pushing.patch b/leaves-server/minecraft-patches/features/0124-Vanilla-Fluid-Pushing.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0126-Vanilla-Fluid-Pushing.patch
rename to leaves-server/minecraft-patches/features/0124-Vanilla-Fluid-Pushing.patch
diff --git a/leaves-server/minecraft-patches/features/0127-Configurable-item-damage-check.patch b/leaves-server/minecraft-patches/features/0125-Configurable-item-damage-check.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0127-Configurable-item-damage-check.patch
rename to leaves-server/minecraft-patches/features/0125-Configurable-item-damage-check.patch
diff --git a/leaves-server/minecraft-patches/features/0128-Old-Throwable-Projectile-tick-order.patch b/leaves-server/minecraft-patches/features/0126-Old-Throwable-Projectile-tick-order.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0128-Old-Throwable-Projectile-tick-order.patch
rename to leaves-server/minecraft-patches/features/0126-Old-Throwable-Projectile-tick-order.patch
diff --git a/leaves-server/minecraft-patches/features/0129-Old-leash-behavior-when-use-firework.patch b/leaves-server/minecraft-patches/features/0127-Old-leash-behavior-when-use-firework.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0129-Old-leash-behavior-when-use-firework.patch
rename to leaves-server/minecraft-patches/features/0127-Old-leash-behavior-when-use-firework.patch
diff --git a/leaves-server/minecraft-patches/features/0130-Old-wet-tnt-explode-behavior.patch b/leaves-server/minecraft-patches/features/0128-Old-wet-tnt-explode-behavior.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0130-Old-wet-tnt-explode-behavior.patch
rename to leaves-server/minecraft-patches/features/0128-Old-wet-tnt-explode-behavior.patch
diff --git a/leaves-server/minecraft-patches/features/0131-Old-projectile-explosion-behavior.patch b/leaves-server/minecraft-patches/features/0129-Old-projectile-explosion-behavior.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0131-Old-projectile-explosion-behavior.patch
rename to leaves-server/minecraft-patches/features/0129-Old-projectile-explosion-behavior.patch
diff --git a/leaves-server/minecraft-patches/features/0132-Prevent-loss-of-item-drops-due-to-update-suppression.patch b/leaves-server/minecraft-patches/features/0130-Prevent-loss-of-item-drops-due-to-update-suppression.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0132-Prevent-loss-of-item-drops-due-to-update-suppression.patch
rename to leaves-server/minecraft-patches/features/0130-Prevent-loss-of-item-drops-due-to-update-suppression.patch
diff --git a/leaves-server/minecraft-patches/features/0133-Fix-block-place-desync-due-to-update-suppression.patch b/leaves-server/minecraft-patches/features/0131-Fix-block-place-desync-due-to-update-suppression.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0133-Fix-block-place-desync-due-to-update-suppression.patch
rename to leaves-server/minecraft-patches/features/0131-Fix-block-place-desync-due-to-update-suppression.patch
diff --git a/leaves-server/minecraft-patches/features/0134-TEMP-Merge-Paper-11831.patch b/leaves-server/minecraft-patches/features/0132-TEMP-Merge-Paper-11831.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0134-TEMP-Merge-Paper-11831.patch
rename to leaves-server/minecraft-patches/features/0132-TEMP-Merge-Paper-11831.patch
diff --git a/leaves-server/minecraft-patches/features/0135-Old-ender-dragon-part-can-use-end-portal.patch b/leaves-server/minecraft-patches/features/0133-Old-ender-dragon-part-can-use-end-portal.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0135-Old-ender-dragon-part-can-use-end-portal.patch
rename to leaves-server/minecraft-patches/features/0133-Old-ender-dragon-part-can-use-end-portal.patch
diff --git a/leaves-server/minecraft-patches/features/0136-Configurable-collision-behavior.patch b/leaves-server/minecraft-patches/features/0134-Configurable-collision-behavior.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0136-Configurable-collision-behavior.patch
rename to leaves-server/minecraft-patches/features/0134-Configurable-collision-behavior.patch
diff --git a/leaves-server/minecraft-patches/features/0137-Chat-command-max-length.patch b/leaves-server/minecraft-patches/features/0135-Chat-command-max-length.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0137-Chat-command-max-length.patch
rename to leaves-server/minecraft-patches/features/0135-Chat-command-max-length.patch
diff --git a/leaves-server/minecraft-patches/features/0138-Lithium-Sleeping-Block-Entity.patch b/leaves-server/minecraft-patches/features/0136-Lithium-Sleeping-Block-Entity.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0138-Lithium-Sleeping-Block-Entity.patch
rename to leaves-server/minecraft-patches/features/0136-Lithium-Sleeping-Block-Entity.patch
diff --git a/leaves-server/minecraft-patches/features/0139-Bring-back-LivingEntity-effect-CME.patch b/leaves-server/minecraft-patches/features/0137-Bring-back-LivingEntity-effect-CME.patch
similarity index 92%
rename from leaves-server/minecraft-patches/features/0139-Bring-back-LivingEntity-effect-CME.patch
rename to leaves-server/minecraft-patches/features/0137-Bring-back-LivingEntity-effect-CME.patch
index 7b8d4d49..6b4a82b7 100644
--- a/leaves-server/minecraft-patches/features/0139-Bring-back-LivingEntity-effect-CME.patch
+++ b/leaves-server/minecraft-patches/features/0137-Bring-back-LivingEntity-effect-CME.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Bring back LivingEntity effect CME
 
 
 diff --git a/net/minecraft/world/entity/LivingEntity.java b/net/minecraft/world/entity/LivingEntity.java
-index 6c9a7ae3e9a340de35ca4dfcd486cfe5818d2aa5..782138474b1b2fab525de607f542f621ca92a0e8 100644
+index 0d493c8343057898166f94a4006a374a214ae7b2..951300caeca0421cabda44496ed2f09fc2258dd0 100644
 --- a/net/minecraft/world/entity/LivingEntity.java
 +++ b/net/minecraft/world/entity/LivingEntity.java
 @@ -1151,7 +1151,7 @@ public abstract class LivingEntity extends Entity implements Attackable, Waypoin
diff --git a/leaves-server/minecraft-patches/features/0140-Do-not-tick-Arrow-life-regardless.patch b/leaves-server/minecraft-patches/features/0138-Do-not-tick-Arrow-life-regardless.patch
similarity index 100%
rename from leaves-server/minecraft-patches/features/0140-Do-not-tick-Arrow-life-regardless.patch
rename to leaves-server/minecraft-patches/features/0138-Do-not-tick-Arrow-life-regardless.patch
diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java b/leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java
index c6844c73..8c2f7746 100644
--- a/leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java
+++ b/leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java
@@ -280,9 +280,6 @@ public final class LeavesConfig {
             @GlobalConfig("shears-in-dispenser-can-zero-amount")
             public boolean shearsInDispenserCanZeroAmount = false;
 
-            @GlobalConfig("armor-stand-cant-kill-by-mob-projectile")
-            public boolean armorStandCantKillByMobProjectile = false;
-
             @GlobalConfig(value = "villager-infinite-discounts", validator = VillagerInfiniteDiscountsValidator.class)
             private boolean villagerInfiniteDiscounts = false;
 
@@ -643,9 +640,6 @@ public final class LeavesConfig {
         @GlobalConfig("no-tnt-place-update")
         public boolean noTNTPlaceUpdate = false;
 
-        @GlobalConfig("raider-die-skip-self-raid-check")
-        public boolean skipSelfRaidCheck = false;
-
         @GlobalConfig("container-passthrough")
         public boolean containerPassthrough = false;
 

From ff184c1da6359ebe57cffa894c64414c1b13f435 Mon Sep 17 00:00:00 2001
From: Helvetica Volubi <88063803+Suisuroru@users.noreply.github.com>
Date: Sun, 31 Aug 2025 11:55:49 +0800
Subject: [PATCH 2/2] Modify end void rings generation (#722)

* Modify end void rings generation

* move to fix

* fix up

---------

Co-authored-by: MC_XiaoHei <xor7xiaohei@gmail.com>
---
 ...141-Modify-end-void-rings-generation.patch | 19 +++++++++++++++++++
 .../org/leavesmc/leaves/LeavesConfig.java     |  3 +++
 2 files changed, 22 insertions(+)
 create mode 100644 leaves-server/minecraft-patches/features/0141-Modify-end-void-rings-generation.patch

diff --git a/leaves-server/minecraft-patches/features/0141-Modify-end-void-rings-generation.patch b/leaves-server/minecraft-patches/features/0141-Modify-end-void-rings-generation.patch
new file mode 100644
index 00000000..03db30b5
--- /dev/null
+++ b/leaves-server/minecraft-patches/features/0141-Modify-end-void-rings-generation.patch
@@ -0,0 +1,19 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Helvetica Volubi <suisuroru@blue-millennium.fun>
+Date: Tue, 26 Aug 2025 03:14:04 +0800
+Subject: [PATCH] Modify end void rings generation
+
+
+diff --git a/net/minecraft/world/level/levelgen/DensityFunctions.java b/net/minecraft/world/level/levelgen/DensityFunctions.java
+index 04527a5c65ad630f794fed9071d485aedd02257a..0298ba0c68447c5d0d555431b3118552b3d90a34 100644
+--- a/net/minecraft/world/level/levelgen/DensityFunctions.java
++++ b/net/minecraft/world/level/levelgen/DensityFunctions.java
+@@ -528,7 +528,7 @@ public final class DensityFunctions {
+             int i1 = z / 2;
+             int i2 = x % 2;
+             int i3 = z % 2;
+-            float f = 100.0F - Mth.sqrt((long)x * (long)x + (long)z * (long)z) * 8.0F; // Paper - cast ints to long to avoid integer overflow
++            float f = org.leavesmc.leaves.LeavesConfig.fix.vanillaEndVoidRings ? 100.0F - Mth.sqrt(x * x + z * z) * 8.0F : 100.0F - Mth.sqrt((long)x * (long)x + (long)z * (long)z) * 8.0F; // Paper - cast ints to long to avoid integer overflow // Leaves - customize end void rings generation
+             f = Mth.clamp(f, -100.0F, 80.0F);
+ 
+             NoiseCache cache = noiseCache.get().computeIfAbsent(noise, noiseKey -> new NoiseCache()); // Paper - Perf: Optimize end generation
diff --git a/leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java b/leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java
index 8c2f7746..cb314cdf 100644
--- a/leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java
+++ b/leaves-server/src/main/java/org/leavesmc/leaves/LeavesConfig.java
@@ -1237,5 +1237,8 @@ public final class LeavesConfig {
         public enum CollisionBehavior {
             VANILLA, BLOCK_SHAPE_VANILLA, PAPER
         }
+
+        @GlobalConfig("vanilla-end-void-rings")
+        public boolean vanillaEndVoidRings = false;
     }
 }