Remove patches that are no longer needed

patches/server/0005-Leaves-Server-Config-And-Command.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Leaves Server Config And Command
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 93412c3eb947afb1ad6ee8dba9864b2d310e0624..9d50d30670d9ac0ffa74eb6da2e84b5bd069839c 100644
+index 61e0e14b74c6585a9d157cae3db9c5c3a69b393f..2cf51683978e72d552f9148a610704202d207df5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1142,6 +1142,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -31,7 +31,7 @@ index b0708f5d72a31720e3696ee707ec21229672bcf0..129c2e6f0cc9d752e7ca5934e13e8935
  
          this.setPvpAllowed(dedicatedserverproperties.pvp);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 857004a702cbc94f53ca17cd19c7affa8d9a83d1..9603dc46d18f2b8eb79e64ecfa09f14a6cd0e275 100644
+index 6bcfd8a1170c3e629574239a0ddad35662eeb218..350830c4875a0834bb5e1d055eaa29f05e8b78b0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1064,6 +1064,7 @@ public final class CraftServer implements Server {
@@ -78,10 +78,10 @@ index 7a266257b1220098a6c829ccf1c597b7e510205a..e85a4aaab6fb6d1784494aad0189539c
                          .withRequiredArg()
 diff --git a/src/main/java/top/leavesmc/leaves/LeavesConfig.java b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..6eda057fd8e9e93e117ddcad289c54b4fbb9f9b7
+index 0000000000000000000000000000000000000000..33ce93d9261068932085961840e5c6542583bf06
 --- /dev/null
 +++ b/src/main/java/top/leavesmc/leaves/LeavesConfig.java
-@@ -0,0 +1,920 @@
+@@ -0,0 +1,916 @@
 +package top.leavesmc.leaves;
 +
 +import com.destroystokyo.paper.util.SneakyThrow;
@@ -597,16 +597,6 @@ index 0000000000000000000000000000000000000000..6eda057fd8e9e93e117ddcad289c54b4
 +
 +    // Leaves start - performance
 +
-+    // Leaves start - performance - fix
-+
-+    @GlobalConfig(name = "fix-paper-6045", category = {"performance", "fix"})
-+    public static boolean fixPaper6045 = true;
-+
-+    @GlobalConfig(name = "fix-paper-9372", category = {"performance", "fix"})
-+    public static boolean fixPaper9372 = true;
-+
-+    // Leaves end - performance - fix
-+
 +    // Leaves start - performance - remove
 +
 +    @GlobalConfig(name = "tick-guard-lambda", category = {"performance", "remove"})
@@ -742,6 +732,12 @@ index 0000000000000000000000000000000000000000..6eda057fd8e9e93e117ddcad289c54b4
 +    @RemovedConfig(name = "async-entity-tracker", category = "performance")
 +    public static boolean asyncEntityTracker = false;
 +
++    @RemovedConfig(name = "fix-paper-6045", category = {"performance", "fix"})
++    public static boolean fixPaper6045 = true;
++
++    @RemovedConfig(name = "fix-paper-9372", category = {"performance", "fix"})
++    public static boolean fixPaper9372 = true;
++
 +    // Leaves end - performance - removed
 +
 +    // Leaves end - performance

patches/server/0020-Fix-Paper-6045-block-goal-shouldn-t-load-chunks.patch

@@ -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, 14 Aug 2022 00:59:42 +0800
-Subject: [PATCH] Fix Paper#6045, block goal shouldn't load chunks
-
-This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
-
-diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java b/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java
-index 07519c817cc6de04a98198c43a0c2b02ba3141eb..3f4ba1f12e1d560abe2540d34d6f1cdd94ec5e55 100644
---- a/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java
-+++ b/src/main/java/net/minecraft/world/entity/ai/goal/MoveToBlockGoal.java
-@@ -120,6 +120,7 @@ public abstract class MoveToBlockGoal extends Goal {
-                 for(int m = 0; m <= l; m = m > 0 ? -m : 1 - m) {
-                     for(int n = m < l && m > -l ? l : 0; n <= l; n = n > 0 ? -n : 1 - n) {
-                         mutableBlockPos.setWithOffset(blockPos, m, k - 1, n);
-+                        if (top.leavesmc.leaves.LeavesConfig.fixPaper6045 && !this.mob.level().hasChunkAt(mutableBlockPos)) continue; // Leaves - if this block isn't loaded, continue
-                         if (this.mob.isWithinRestriction(mutableBlockPos) && this.isValidTarget(this.mob.level(), mutableBlockPos)) {
-                             this.blockPos = mutableBlockPos;
-                             this.mob.movingTarget = mutableBlockPos == BlockPos.ZERO ? null : mutableBlockPos.immutable(); // Paper

patches/server/0020-Optimize-entity-coordinate-key.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize entity coordinate key
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/io/papermc/paper/util/MCUtil.java b/src/main/java/io/papermc/paper/util/MCUtil.java
-index 200ed770b57e1a9240abf0473968d4b85cbefe3c..bf16715db2424f0b05854ae7665b4448e036cd0b 100644
+index 850f75172e9efa72cabb8e5bd124b96a0b1a945f..d1f872c062333e7cfbfb5ad6d77a1e317e6ff3d8 100644
 --- a/src/main/java/io/papermc/paper/util/MCUtil.java
 +++ b/src/main/java/io/papermc/paper/util/MCUtil.java
 @@ -212,7 +212,13 @@ public final class MCUtil {
@@ -25,7 +25,7 @@ index 200ed770b57e1a9240abf0473968d4b85cbefe3c..bf16715db2424f0b05854ae7665b4448
  
      public static long getCoordinateKey(final ChunkPos pair) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 30a2cd24727d1cffc31b077b383487f3bdb6ce4a..3f334ff8da00d37364e796685f672edfc8b449bf 100644
+index 51e7bce3813dec3c60677f8233d522c3d5d55cc5..8078a716cba6baa5723a5b2feda2b04e9a35887f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -308,7 +308,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S

patches/server/0022-Only-check-for-spooky-season-once-an-hour.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Only check for spooky season once an hour
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/world/entity/ambient/Bat.java b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
-index 6b614818b14ecfc8fc82b523eeb7e21fdf9bf1ba..0cb018795bc3f76d6a5afa4da591322d6bb5475f 100644
+index 44fa2d4f90389f5526746bd94a2450c03340bd0b..3f51df1325f8cec5bd979cc4896a091c4157667d 100644
 --- a/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 +++ b/src/main/java/net/minecraft/world/entity/ambient/Bat.java
 @@ -241,13 +241,30 @@ public class Bat extends AmbientCreature {

patches/server/0028-Throttle-goal-selector-during-inactive-ticking.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Throttle goal selector during inactive ticking
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Mob.java b/src/main/java/net/minecraft/world/entity/Mob.java
-index a7fbd329ea6d36a46c00b4476c74e426dbbfe238..f0e1318a0a7d7a409df8fc5567040de9da25b75d 100644
+index 24629412d2b4acaa81788ce70412b03387cc777c..33903f1c9a2c3327404fcdbfaeb2987fafe2d84b 100644
 --- a/src/main/java/net/minecraft/world/entity/Mob.java
 +++ b/src/main/java/net/minecraft/world/entity/Mob.java
 @@ -221,11 +221,13 @@ public abstract class Mob extends LivingEntity implements Targeting {

patches/server/0030-Remove-lambda-from-ticking-guard.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Remove lambda from ticking guard
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index 9018a9b714a157045e473294ee59980c561b9050..b1f7e80c6c762be4ac960cdd98970924da54b5dc 100644
+index bb5833265661bfdef0808745c65ec04cc9240519..be185196d2d4ce1f1dd90da8a46b014127e591a0 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -902,7 +902,24 @@ public class ServerLevel extends Level implements WorldGenLevel {

patches/server/0031-Remove-iterators-from-inventory-contains.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Remove iterators from inventory contains
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/world/entity/player/Inventory.java b/src/main/java/net/minecraft/world/entity/player/Inventory.java
-index 96d664c28738d6090f7067761c2978dd1aa0fd0e..41cb0d1efd81b7754b68c89af289c1260779c08b 100644
+index 309acf7bd07e38043aa81e0e686edba1136bd04c..d2f6027056af9d2816542f4e3d9e278d9ec2c9b4 100644
 --- a/src/main/java/net/minecraft/world/entity/player/Inventory.java
 +++ b/src/main/java/net/minecraft/world/entity/player/Inventory.java
 @@ -687,21 +687,35 @@ public class Inventory implements Container, Nameable {

patches/server/0035-Reduce-entity-fluid-lookups-if-no-fluids.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Reduce entity fluid lookups if no fluids
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fb7fbaeeb61ee0a95f126c0d2b7355a83741fcef..e33fff62f13a26cf681cf20f187bba2f885148f9 100644
+index 8078a716cba6baa5723a5b2feda2b04e9a35887f..00983d59c699e6557eae0f4d3bd144e71147c9f7 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -4411,16 +4411,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S

patches/server/0036-Reduce-chunk-loading-lookups.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Reduce chunk loading & lookups
 This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index bd5996eef2d946e9d7765b6b315bc5951158810e..a6da5165ac20e01a9162b216cddf7b0dc040b5a9 100644
+index f33c03e81b7ff643741f56eea055e6af260de618..9ea374d9baf1612898b67f329e6b5c798ad43b3e 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -333,11 +333,28 @@ public class EnderMan extends Monster implements NeutralMob {

patches/server/0037-PCA-sync-protocol.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] PCA sync protocol
 This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
 
 diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
-index d9539f5275c4cb63910ba79aa522d9569ad35a89..577b0c8b1aee4cd120f4ef22b1fde27cb3f6c376 100644
+index 815eb15086976b8f9e03bf8182d9ed50aec14720..50b690261be56ce1806c611c006d52c5ca02f9c5 100644
 --- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 +++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
 @@ -373,6 +373,11 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
@@ -22,7 +22,7 @@ index d9539f5275c4cb63910ba79aa522d9569ad35a89..577b0c8b1aee4cd120f4ef22b1fde27c
  
          this.updateContainerEquipment();
 diff --git a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
-index 5a591c439c5cef6b7e7e6f836ab813cb4f29b08c..17cc25b6fbc85c9e0023be7e9d857b2d76f6e58c 100644
+index 4e6c2f6b2e54a4c126e9a026b9cad05ce835ad66..fd1648546542f146ba7b866873f105ed1427ef7d 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/AbstractVillager.java
 @@ -64,6 +64,15 @@ public abstract class AbstractVillager extends AgeableMob implements InventoryCa
@@ -61,7 +61,7 @@ index 6d23c39e4eadf23616080d6d08672e13b5d3c37d..f86384ba4e5b5ffd26dd64e41a9af8a3
      @Override
      public boolean stillValid(Player player) {
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
-index 5eaab97a0c3b93a44a45e2ed11033fe01c0c95c2..d31bcddad2fa2ebac6269cc7bf22254710c1843e 100644
+index d04fc84eef11adb5ea64077f48794b6ed7fb3ada..29580b4f6841c5c3398f8b4b224d9383f006cfb1 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
 @@ -570,6 +570,16 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
@@ -103,7 +103,7 @@ index 416aa989ebb18a8741cc9d605a1180ab830f6643..213bc3c11ff4ed9bc761e8153aa669d1
      protected Component getDefaultName() {
          return Component.translatable("container.barrel");
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
-index 3ba04d615fae9748c144b3dc7e7442be2e5a659f..bb16de61eeafe0d446e43710accb40991dc7c129 100644
+index 56b328c64bea0ffd51930d8ba15fb87a36e6d8a1..e4430f96f055333c94ef1f910e198122bec86871 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/BeehiveBlockEntity.java
 @@ -4,6 +4,7 @@ import com.google.common.collect.Lists;
@@ -185,7 +185,7 @@ index bc01481ac5990ad1cfd1def5a16dd0ed2f9de8c9..e7bfc1008d270de81b375e3dd6e3c343
      public boolean stillValid(Player player) {
          return Container.stillValidBlockEntity(this, player);
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
-index a71414397bd45ee7bcacfeef0041d80dfa25f114..1d6c7a04b8246a60d80325e1615e50573b17a6bb 100644
+index 9b1243d96e0694c62fc9e82e9be540bce0d2b3ad..13e778bd47792deb571a5294bcf86cec5e04a5cc 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/ChestBlockEntity.java
 @@ -190,6 +190,16 @@ public class ChestBlockEntity extends RandomizableContainerBlockEntity implement
@@ -248,7 +248,7 @@ index 881379681c39230a00b3a1f11cd87498984396c7..e01eb2025458cf311348c58a15308540
      protected Component getDefaultName() {
          return Component.translatable("container.dispenser");
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index df1c1c27b7c0065f8179d59bdb9de01dde22befa..b17b8f2a773fcdd20d26dcdb083d59f6b89af37f 100644
+index a61d7cd2b078fe511ff00344197b6ea11feebfb2..dfc623059f9c5920883a06f9662f1bf3b7a2c4c6 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 @@ -129,6 +129,16 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen

patches/server/0038-BBOR-Protocol.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] BBOR Protocol
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 02427973b52898ab2d87d7585801fe14555d2ae4..4c7262354c85aab0e70b7bfdadaa9741b0beadc5 100644
+index 6a5ff44abca2bf5096bceb4f9ab2454e78b80fea..aee640da4164195962b165f1d4ae385dbfd9d3d3 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1622,6 +1622,7 @@ public abstract class PlayerList {
@@ -17,7 +17,7 @@ index 02427973b52898ab2d87d7585801fe14555d2ae4..4c7262354c85aab0e70b7bfdadaa9741
  
      public boolean isAllowCheatsForAllPlayers() {
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 6f89a493f557a55075263a74f32682fec66f4f23..226783152422548a5ac157605fb25cddef5eeeb6 100644
+index ae746ebde8ba2aded37bc1c9b3c4acdfd5f9def0..344ebb91a1cd4c74d398ded5edd8ef68047d19b2 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -931,6 +931,11 @@ public class LevelChunk extends ChunkAccess {

patches/server/0043-Player-operation-limiter.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Player operation limiter
 This patch is Powered by plusls-carpet-addition(https://github.com/plusls/plusls-carpet-addition)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 23260d76c00e37df8499168ebfae21f0ee077cca..bb3b204a9734b75fe8dbeca7e44267a3278750e2 100644
+index 6767665e55ca1ec9cf2707918c349fd3ea5ada8a..6c15eb1a368aa41c44521054b95a8a46776d76a4 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -282,6 +282,10 @@ public class ServerPlayer extends Player {
@@ -62,7 +62,7 @@ index 23260d76c00e37df8499168ebfae21f0ee077cca..bb3b204a9734b75fe8dbeca7e44267a3
      // CraftBukkit end
  }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index cfd4ac06a9af6bf3fac293110482e1df690e075e..68f351d87f178810df64b63d9f01f1314081a13f 100644
+index a7b217ddbcbf92513bd38101fdfca2075505e267..e4436d3f479246eff4b0ad06d6d24fc12b4e0c90 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -44,6 +44,7 @@ import org.bukkit.event.Event;

patches/server/0044-Renewable-Elytra.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Renewable Elytra
 This patch is Powered by Carpet-TIS-Addition(https://github.com/plusls/Carpet-TIS-Addition)
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Phantom.java b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
-index 5b4719dd7c3b8f93c898779f45239568f6a5fe43..9c0b9eb91c07aae0cb43a0988ccd4381eecfbbf7 100644
+index 187037c43ebb5b245ffa4b50163d443490668744..29d735390dbe0c7169b576c469f3a3957a6bfb45 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Phantom.java
 @@ -36,6 +36,8 @@ import net.minecraft.world.entity.ai.goal.Goal;

patches/server/0047-MC-Technical-Survival-Mode.patch

@@ -31,7 +31,7 @@ index fa1c0aee8c3a4d0868482cf5c703bbfd08e09874..c24148d8486420434922864df6f1ffa0
              throw new RuntimeException("Could not reload paper configuration files", ex);
          }
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index b1f7e80c6c762be4ac960cdd98970924da54b5dc..c78fdfaca4bb94cd1cd8075655645082b0f6746f 100644
+index be185196d2d4ce1f1dd90da8a46b014127e591a0..2211887522f4ee9e069e8d42d797906343864f75 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2728,7 +2728,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -44,7 +44,7 @@ index b1f7e80c6c762be4ac960cdd98970924da54b5dc..c78fdfaca4bb94cd1cd8075655645082
                  pearl.ownerUUID = null;
              }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index bb3b204a9734b75fe8dbeca7e44267a3278750e2..5ce2329f117eea5de6094c8dd7d37aec08b5e2a6 100644
+index 6c15eb1a368aa41c44521054b95a8a46776d76a4..1e0964320b01603953882247895946ad52d70ead 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -1533,7 +1533,7 @@ public class ServerPlayer extends Player {
@@ -70,7 +70,7 @@ index c99ab157e43fc990549fc06f5b6fb1e227014fde..22812fce0f0427e94d1fdfe08cea1a12
                      || ((ServerLevel) this.level()).getDragonFight() == null
                      || ((ServerLevel) this.level()).getDragonFight().respawnStage == null
 diff --git a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
-index 2498f942ab55a2ee9af4822c300ec6f45811ef3f..2c4f9aa4ad22393e19e01e8e14e367968b5cba57 100644
+index cd7b955754b809826048b80723e2e9055b373a4a..83ef6f6555fb810236659b395ce17fa414d7a567 100644
 --- a/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 +++ b/src/main/java/net/minecraft/world/entity/item/PrimedTnt.java
 @@ -71,7 +71,7 @@ public class PrimedTnt extends Entity implements TraceableEntity {
@@ -96,7 +96,7 @@ index 156809090f1f83ad68e7e2477a3cfddac5757a8e..7f191b04f7c84f3188b96c108616424b
  
          this.leftOwner = nbt.getBoolean("LeftOwner");
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index e9175ec3d508ee72b1893e5b102033c886e9f022..232a70f79e6c5bd7fc055c0adf65ad0bbff55116 100644
+index 93fbf20c6e5ded31570415c30b837f5dc0dd5d42..667a480b7c546bb130bbd32a8ae7ce85d37a6b0a 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -95,7 +95,7 @@ public final class NaturalSpawner {

patches/server/0050-Xaero-Map-Protocol.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Xaero Map Protocol
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index a7730d9ffc6ccd743e227c99bb3bd43f282dee19..5f67d9e77aab73056328ba48c50f678c1e0f7262 100644
+index 8a40b3d93bebddef417642a947ac73c894dea427..823fd92c38263278673a8c9639952466c51ca16c 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -1322,6 +1322,7 @@ public abstract class PlayerList {

patches/server/0051-Leaves-Extra-Yggdrasil-Service.patch

@@ -44,7 +44,7 @@ index 61840cfd64caba6595dfc99c91c76a195638d4ee..46d6db53dbf44228574164cc458c94b9
              String s = (String) Optional.ofNullable((String) optionset.valueOf("world")).orElse(dedicatedserversettings.getProperties().levelName);
              LevelStorageSource convertable = LevelStorageSource.createDefault(file.toPath());
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0328722b7c25c258ff7adc312faf4f80ce76f1bd..2136cdddbaa90201c778efa435a35588476e9e9c 100644
+index e1ef234f54bc3335c11add788d41db10f2eb1e2d..0e241a87f625b9cf952c59f9b0670d60563bdf06 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -259,7 +259,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

patches/server/0052-Use-vanilla-random-config.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Use vanilla random config
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e33fff62f13a26cf681cf20f187bba2f885148f9..eb673c7ed083ef731263d60a9298e58934bc370f 100644
+index 00983d59c699e6557eae0f4d3bd144e71147c9f7..3c12f375e42d9f72470b73fc84b5d86a21f26a99 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -577,7 +577,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S

patches/server/0053-Fix-update-suppression-crash.patch

@@ -20,7 +20,7 @@ index d0a487f0d563181818c5670749e8dd3a9d939265..140a9070fb5859e762e40ddb1e4259f6
                          label25:
                          {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index acc9973099d253bbbfe6b6a885ec4010893c5d08..414360e531ad3562c22d266e0592a19984bf2ca4 100644
+index 0e241a87f625b9cf952c59f9b0670d60563bdf06..b7f16c3e7b1427fb5a1d2b378a60a47eb9090b9e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1691,7 +1691,13 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

patches/server/0054-Bedrock-break-list.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bedrock break list
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 414360e531ad3562c22d266e0592a19984bf2ca4..db16f74e87d62aba9f7cb2926935cbce1d724d48 100644
+index b7f16c3e7b1427fb5a1d2b378a60a47eb9090b9e..693e3c15bd3bcba53d162c2cd2a742e29e4798f7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1727,6 +1727,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa

patches/server/0058-No-feather-falling-trample.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] No feather falling trample
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/FarmBlock.java b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-index 59bbdead2ebd8965d222540c7243dde051bbcc4b..3eaa46b60aa8f4fcdbfa54dbcf1e051ec2eda140 100644
+index 6e4c852c93f2418ea69e485ed3a10cbe3a6e3bd2..4630cb593cd493c5105c53e70d099f3aa1dd212f 100644
 --- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
 @@ -111,6 +111,13 @@ public class FarmBlock extends Block {

patches/server/0059-Shared-villager-discounts.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Shared villager discounts
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java b/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java
-index 097007c1c25ba55d9916fc820dd1d1149d81f6f4..67c0a46b098d631b862df80511990c396934200b 100644
+index 2240fc6d5ba9530fcd62d6b560c17a275d4f164a..8baaf2675cc295867d7ad94b6966a9387ea8f2c6 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/gossip/GossipContainer.java
 @@ -120,6 +120,16 @@ public class GossipContainer {

patches/server/0060-Redstone-wire-dont-connect-if-on-trapdoor.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Redstone wire dont connect if on trapdoor
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/RedStoneWireBlock.java b/src/main/java/net/minecraft/world/level/block/RedStoneWireBlock.java
-index 507be06ad51b7a212e28d3ca6680e0e4b00f4233..a00cdca84be352528e54f8369bd12043f4fc776a 100644
+index b5a71fd4e2f55bf036c2c697da5d50cc90fc657c..6afe31169948d644f9af68b8eb31a89c53304826 100644
 --- a/src/main/java/net/minecraft/world/level/block/RedStoneWireBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/RedStoneWireBlock.java
 @@ -174,7 +174,7 @@ public class RedStoneWireBlock extends Block {

patches/server/0061-Disable-check-out-of-order-command.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Disable check out-of-order command
 
 
 diff --git a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
-index 22ead092ae984d1eaa052fe97981ce3c49b521d8..9036306e153a7b3e919a9c8ecdf162d91359e38e 100644
+index ba12919c3f9aec34a9e64993b143ae92be5eb172..bbb8d46cd915b06ab2b308cc991e4c7df6c56e5f 100644
 --- a/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
 +++ b/src/main/java/net/minecraft/network/chat/SignedMessageChain.java
 @@ -38,7 +38,7 @@ public class SignedMessageChain {

patches/server/0062-Despawn-enderman-with-block.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Despawn enderman with block
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
-index a6da5165ac20e01a9162b216cddf7b0dc040b5a9..602340221cbba4a9edc155800b2a9188b8f7d522 100644
+index 9ea374d9baf1612898b67f329e6b5c798ad43b3e..5afa37d2026833c1ded968f957c522436dfe43fd 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/EnderMan.java
 @@ -486,7 +486,7 @@ public class EnderMan extends Monster implements NeutralMob {

patches/server/0065-Optimized-dragon-respawn.patch

@@ -18,7 +18,7 @@ index d0a047fd8849e9210dc9424325561f5a1b9998df..b665410788aa7c889dc214c2a97a9c29
              for(int j = 0; j < this.height; ++j) {
                  for(int k = 0; k < this.depth; ++k) {
 diff --git a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
-index c1ff2e15bc5da1a642872ac0fdcdc457e8abb063..467ddfbb53ef4bbe92ea7372f0654fc39d2a619d 100644
+index 7e9c502a7bcda445333adc250a3106f33d38c128..a54723f8f893f2445467d0056082c92eb121185f 100644
 --- a/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 +++ b/src/main/java/net/minecraft/world/level/dimension/end/EndDragonFight.java
 @@ -45,6 +45,7 @@ import net.minecraft.world.entity.boss.enderdragon.phases.EnderDragonPhase;

patches/server/0068-Spawn-ignore-lc.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Spawn ignore lc
 
 
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 232a70f79e6c5bd7fc055c0adf65ad0bbff55116..4eac3f2acaf70e83b9241ed55ae5f9ecf39d2e67 100644
+index 667a480b7c546bb130bbd32a8ae7ce85d37a6b0a..3e10668ca548472238bb4bb0a80a89f169a71496 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -40,6 +40,7 @@ import net.minecraft.world.level.block.state.BlockState;

patches/server/0071-Fix-Paper-9372.patch

@@ -1,43 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: violetc <58360096+s-yh-china@users.noreply.github.com>
-Date: Tue, 4 Jul 2023 14:03:03 +0800
-Subject: [PATCH] Fix Paper#9372
-
-This patch is Powered by Pufferfish(https://github.com/pufferfish-gg/Pufferfish)
-
-diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index ee85716ac98caa2e63f34be26a48d6b75b0179e3..297d51fada6e89980d0daccdb636dcc3aef3e6cf 100644
---- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
-+++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1264,6 +1264,7 @@ public class ServerPlayer extends Player {
-                 this.setServerLevel(worldserver);
-                 this.connection.teleport(exit); // CraftBukkit - use internal teleport without event
-                 this.connection.resetPosition();
-+                if (top.leavesmc.leaves.LeavesConfig.fixPaper9372) this.mainSupportingBlockPos = Optional.empty(); // Leaves - fix paper 9372
-                 worldserver.addDuringPortalTeleport(this);
-                 worldserver1.getProfiler().pop();
-                 this.triggerDimensionChangeTriggers(worldserver1);
-@@ -2077,6 +2078,7 @@ public class ServerPlayer extends Player {
-     public void moveTo(double x, double y, double z) {
-         super.moveTo(x, y, z);
-         this.connection.resetPosition();
-+        if (top.leavesmc.leaves.LeavesConfig.fixPaper9372) this.mainSupportingBlockPos = Optional.empty(); // Leaves - fix paper 9372
-     }
- 
-     @Override
-@@ -2323,6 +2325,7 @@ public class ServerPlayer extends Player {
- 
-             this.connection.send(new ClientboundSetCameraPacket(this.camera));
-             this.connection.resetPosition();
-+            if (top.leavesmc.leaves.LeavesConfig.fixPaper9372) this.mainSupportingBlockPos = Optional.empty(); // Leaves - fix paper 9372
-         }
- 
-     }
-@@ -2762,6 +2765,7 @@ public class ServerPlayer extends Player {
-     public void forceSetPositionRotation(double x, double y, double z, float yaw, float pitch) {
-         this.moveTo(x, y, z, yaw, pitch);
-         this.connection.resetPosition();
-+        if (top.leavesmc.leaves.LeavesConfig.fixPaper9372) this.mainSupportingBlockPos = Optional.empty(); // Leaves - fix paper 9372
-     }
- 
-     @Override

patches/server/0071-Lava-riptide.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Lava riptide
 
 
 diff --git a/src/main/java/net/minecraft/world/item/TridentItem.java b/src/main/java/net/minecraft/world/item/TridentItem.java
-index 5fab851b319847035fb1eefd0ab999de3ccc2cd8..272a509aea654c76628915d61b7d57b888e34e93 100644
+index fa876ddf54780728e7f3ecfe02aa8a16b8ef6f8d..2dad3b64673186c8776f414d68ae392818a2d749 100644
 --- a/src/main/java/net/minecraft/world/item/TridentItem.java
 +++ b/src/main/java/net/minecraft/world/item/TridentItem.java
 @@ -66,7 +66,7 @@ public class TridentItem extends Item implements Vanishable {

patches/server/0072-No-block-update-command.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] No block update command
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
-index c78fdfaca4bb94cd1cd8075655645082b0f6746f..ff957be41684f0c722b1dcac4f2ac09975f80236 100644
+index 2211887522f4ee9e069e8d42d797906343864f75..678410cd734cd7e3e3b999b7908f2e3f25f23a13 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2506,6 +2506,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -30,7 +30,7 @@ index ed27a963223bfe18310ad5adabf461b5e307ef9c..80e9b0615fc8036897b2dc8b0aefc4ef
  
                          world.notifyAndUpdatePhysics(newblockposition, null, oldBlock, block, world.getBlockState(newblockposition), updateFlag, 512); // send null chunk as chunk.k() returns false by this point
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index 226783152422548a5ac157605fb25cddef5eeeb6..f05e51f76a20aafe8e272cc595a4aca634d50d7f 100644
+index 344ebb91a1cd4c74d398ded5edd8ef68047d19b2..8d1b9391eb01ebf85d096e9c211629aef1034482 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -481,7 +481,7 @@ public class LevelChunk extends ChunkAccess {
@@ -55,7 +55,7 @@ index 82cad323e4fba9aea082047d3eb6c4351681d9af..8a9b471b3cfff45a6c78d8fffa0efb33
              FluidState fluid1 = this.getNewLiquid(world, pos, world.getBlockState(pos));
              int i = this.getSpreadDelay(world, pos, state, fluid1);
 diff --git a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
-index 395bb163fb1d62dd2e6949e1146c337c0bbc626f..9da8651a12db6a2442578a2c1d59e75216d96753 100644
+index 87db9febbbf53702be0e1e89a95db99e823713e5..d21b9aa7812053bbd05e07b3f037697590b10ace 100644
 --- a/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
 +++ b/src/main/java/net/minecraft/world/level/redstone/CollectingNeighborUpdater.java
 @@ -46,6 +46,7 @@ public class CollectingNeighborUpdater implements NeighborUpdater {

patches/server/0073-Raider-die-skip-self-raid-check.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Raider die skip self raid check
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/raid/Raider.java b/src/main/java/net/minecraft/world/entity/raid/Raider.java
-index cdbc925ef61b8b439415f0a89368227890bcecb2..b89deba5bf6a78c26485633421c7d0b3b1462219 100644
+index 226fb5c88dd43c8008c5237299ef80db9e847af7..dc1c63efc6c2ba1693dad9c484caff29f5634475 100644
 --- a/src/main/java/net/minecraft/world/entity/raid/Raider.java
 +++ b/src/main/java/net/minecraft/world/entity/raid/Raider.java
 @@ -134,7 +134,7 @@ public abstract class Raider extends PatrollingMonster {

patches/server/0077-SIMD-support.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] SIMD support
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 32fb084862ce074cdbf69fff4847aa31bfd08db2..3f1316110dd00ae51e2bde8bd87e3b582587b92c 100644
+index f5c83d033a8163786f8f7e98655e65bb606bc9dc..ca79034c1f044a9096de65b0936971c4fd68eb32 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -68,6 +68,7 @@ tasks.withType<JavaCompile> {

patches/server/0079-Faster-chunk-serialization.patch

@@ -25,7 +25,7 @@ index 8bafd5fd7499ba4a04bf706cfd1e156073716e21..7082022412dc75e3d84c74acd19bb845
 +    <T> void compact(Palette<T> srcPalette, Palette<T> dstPalette, short[] out); // Leaves - faster chunk serialization
  }
 diff --git a/src/main/java/net/minecraft/util/SimpleBitStorage.java b/src/main/java/net/minecraft/util/SimpleBitStorage.java
-index e4d0d7e8fc58b8f9f614d74a141e452166e0364c..efe0a8b008d25a4c396bc9945d6466b672bc209b 100644
+index 453c1d7e01970fd817d27f59c3b00ffc70e8ca0c..a72aced047b7fa80a3484fc0b60eaa0c18a52b19 100644
 --- a/src/main/java/net/minecraft/util/SimpleBitStorage.java
 +++ b/src/main/java/net/minecraft/util/SimpleBitStorage.java
 @@ -3,6 +3,7 @@ package net.minecraft.util;
@@ -82,7 +82,7 @@ index e4d0d7e8fc58b8f9f614d74a141e452166e0364c..efe0a8b008d25a4c396bc9945d6466b6
 +    // Leaves end - faster chunk serialization
  }
 diff --git a/src/main/java/net/minecraft/util/ZeroBitStorage.java b/src/main/java/net/minecraft/util/ZeroBitStorage.java
-index 311625277a26c9c187025a1036978229241b965f..e23995acb97100830079677aab0896487a705416 100644
+index f8de91393564b3691c17339ac9196cc0fc1cf748..63c45b6f625fbab5e1d7513132f4d89fcab7a23d 100644
 --- a/src/main/java/net/minecraft/util/ZeroBitStorage.java
 +++ b/src/main/java/net/minecraft/util/ZeroBitStorage.java
 @@ -3,6 +3,7 @@ package net.minecraft.util;
@@ -112,7 +112,7 @@ index acae3eb30e0689048937f479dc3070f0688abdad..029b62acf1d9f8479ab64a55c12f00ba
      int onResize(int newBits, T object);
  }
 diff --git a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
-index 16fbc633de3a1d9e5e8c65ae107397a6f0e50811..deef0363ce82d221726e8e4a6b11683e511f3049 100644
+index 983799520ce052d98c9231f4f7925492d4f7d5c9..7ecc67f7cd1493da37025adda152a3bd098130a2 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/PalettedContainer.java
 @@ -23,8 +23,25 @@ import net.minecraft.util.Mth;

patches/server/0080-Optimize-world-generation-chunk-and-block-access.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize world generation chunk and block access
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/server/level/WorldGenRegion.java b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
-index 14a5492428eac823a295ef3746d0aca6fbdab4ec..bd1b75907d9fd9726ce513b9e0d84abfa5ed9ae9 100644
+index 5ece375eaf6bcc61864997a389bb5e24625e4505..68d806b4e397f9f90bd66138cbdd23f3108b87e7 100644
 --- a/src/main/java/net/minecraft/server/level/WorldGenRegion.java
 +++ b/src/main/java/net/minecraft/server/level/WorldGenRegion.java
 @@ -83,6 +83,10 @@ public class WorldGenRegion implements WorldGenLevel {

patches/server/0081-Cache-world-generator-sea-level.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Cache world generator sea level
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java b/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
-index 58609a0911c4e32b6f80f050cd3d23f70ad75b1b..3524296ec3b3495b65f83d84005499d218a59254 100644
+index 98c7f695093acbcf9382a5f07a7a89e373709763..5cb228f3362b87418561ed3a77f4a241ddb8e9b5 100644
 --- a/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
 +++ b/src/main/java/net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator.java
 @@ -62,12 +62,17 @@ public final class NoiseBasedChunkGenerator extends ChunkGenerator {

patches/server/0089-Optimize-sun-burn-tick.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize sun burn tick
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 406c973cc3765dd60e2fa14b18baaa38522c8f00..ffad59f865a138aa9aef73881a608b058c7fba22 100644
+index f7aa3c7b38847d0d1be4417d99ed2edc3e4c0e6d..42aa275f86101cb697f2525542be5d16815f6863 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -2024,8 +2024,22 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S

patches/server/0091-Use-optimized-collection.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Use optimized collection
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index b9529693ff28e3be6fc20523e76d3cc7ccacec6f..5dea3d1a33f107959562d64493baffc7dc6dfdd3 100644
+index b460bef510213f10a913c162d9a167146c6b019d..3d682670ae0ae6da7492633d2688dc31086e3665 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
 @@ -237,7 +237,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
@@ -41,7 +41,7 @@ index 50a9f33aa31e9273c7c52d4bb2b02f0f884f7ba5..53021c7d173b3c067322e356fead0949
              });
              return Collections.unmodifiableCollection(list);
 diff --git a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
-index 4ee998ae0406d20e3106b7e51911d86313a2e2f8..55640ec8afb2cbb8df6be50d02846d53191e6e32 100644
+index e1f3890dd63332a5af3aa08cd4ba24ef2eaf233a..abc8db6d878d853e0b7f1b8197e86409f6735fc3 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/attributes/AttributeMap.java
 @@ -20,8 +20,10 @@ import org.slf4j.Logger;
@@ -58,7 +58,7 @@ index 4ee998ae0406d20e3106b7e51911d86313a2e2f8..55640ec8afb2cbb8df6be50d02846d53
      private final java.util.function.Function<Attribute, AttributeInstance> createInstance; // Leaves - reduce entity allocations
  
 diff --git a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
-index b738ee2d3801fadfd09313f05ae24593e56b0ec6..2d1abb9518795875b3719efe91e60508c2c73163 100644
+index 676f5485a4ca9252e911213dcda8d51776b637b6..a7d6545876f2209f3ce9a07d3eff19369f255dc3 100644
 --- a/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
 +++ b/src/main/java/net/minecraft/world/entity/ai/goal/GoalSelector.java
 @@ -28,7 +28,7 @@ public class GoalSelector {
@@ -71,7 +71,7 @@ index b738ee2d3801fadfd09313f05ae24593e56b0ec6..2d1abb9518795875b3719efe91e60508
      private final EnumSet<Goal.Flag> disabledFlags = EnumSet.noneOf(Goal.Flag.class); // Paper unused, but dummy to prevent plugins from crashing as hard. Theyll need to support paper in a special case if this is super important, but really doesn't seem like it would be.
      private final com.destroystokyo.paper.util.set.OptimizedSmallEnumSet<net.minecraft.world.entity.ai.goal.Goal.Flag> goalTypes = new com.destroystokyo.paper.util.set.OptimizedSmallEnumSet<>(Goal.Flag.class); // Paper - remove streams from pathfindergoalselector
 diff --git a/src/main/java/net/minecraft/world/level/GameRules.java b/src/main/java/net/minecraft/world/level/GameRules.java
-index afe91d02363bf7385d34447dda8960980ec48443..f33e42303f15be4910e0edbacbe46853800d2321 100644
+index c246981987017a2f86c5d632929356855e2b5714..b3005972ea8c21198d8ea19f1f90d2a41dce3b8b 100644
 --- a/src/main/java/net/minecraft/world/level/GameRules.java
 +++ b/src/main/java/net/minecraft/world/level/GameRules.java
 @@ -141,7 +141,7 @@ public class GameRules {
@@ -84,7 +84,7 @@ index afe91d02363bf7385d34447dda8960980ec48443..f33e42303f15be4910e0edbacbe46853
          // Paper start - Perf: Use array for gamerule storage
          int arraySize = rules.keySet().stream().mapToInt(key -> key.gameRuleIndex).max().orElse(-1) + 1;
 diff --git a/src/main/java/net/minecraft/world/level/block/Block.java b/src/main/java/net/minecraft/world/level/block/Block.java
-index cb724beef6fe6750c63622500fc0f278bba1d8ca..37a17ea3c240ab62c1265061bdd160b582aad5e6 100644
+index 10c0fdfec1fcec3f9f7897685b2c7e00dc291b2d..0950fbe3da9f166c73da8991df6619107e10542f 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
 @@ -62,6 +62,7 @@ import net.minecraft.world.phys.shapes.BooleanOp;

patches/server/0095-Cache-ominous-banner-item.patch

@@ -38,7 +38,7 @@ index eaa2943b667967f93f28d9d794d702fdaeb670ec..5ceef34c59f1fca9a539ce93aa181456
          CompoundTag nbttagcompound = new CompoundTag();
          ListTag nbttaglist = (new BannerPattern.Builder()).addPattern(BannerPatterns.RHOMBUS_MIDDLE, DyeColor.CYAN).addPattern(BannerPatterns.STRIPE_BOTTOM, DyeColor.LIGHT_GRAY).addPattern(BannerPatterns.STRIPE_CENTER, DyeColor.GRAY).addPattern(BannerPatterns.BORDER, DyeColor.LIGHT_GRAY).addPattern(BannerPatterns.STRIPE_MIDDLE, DyeColor.BLACK).addPattern(BannerPatterns.HALF_HORIZONTAL, DyeColor.LIGHT_GRAY).addPattern(BannerPatterns.CIRCLE_MIDDLE, DyeColor.LIGHT_GRAY).addPattern(BannerPatterns.BORDER, DyeColor.BLACK).toListTag();
 diff --git a/src/main/java/net/minecraft/world/entity/raid/Raider.java b/src/main/java/net/minecraft/world/entity/raid/Raider.java
-index e046a733ab380d21b7e7f6dd7b5dbbcb5cf62232..e1ea327c94e6d9cc030b0f891476cf36d296f36f 100644
+index dc1c63efc6c2ba1693dad9c484caff29f5634475..d37a01705421dc4f1c8ad14ef7ca50e90c821a0c 100644
 --- a/src/main/java/net/minecraft/world/entity/raid/Raider.java
 +++ b/src/main/java/net/minecraft/world/entity/raid/Raider.java
 @@ -47,7 +47,7 @@ public abstract class Raider extends PatrollingMonster {

patches/server/0096-Skip-entity-move-if-movement-is-zero.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Skip entity move if movement is zero
 This patch is Powered by Gale(https://github.com/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index ffad59f865a138aa9aef73881a608b058c7fba22..6b53d174a6013b7dbb2355bace4db89b5d209cf7 100644
+index 42aa275f86101cb697f2525542be5d16815f6863..268326d78b03aad9b0efa14eb009881c9397a2f6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -316,6 +316,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S

patches/server/0098-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/GaleMC/Gale)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6b53d174a6013b7dbb2355bace4db89b5d209cf7..e6e87d23becafc8471c6d7211daa9992d66099da 100644
+index 268326d78b03aad9b0efa14eb009881c9397a2f6..318edf18fc2c339ac881a1e5a957154eeb330255 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1252,9 +1252,16 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource, S

patches/server/0099-Fix-villagers-dont-release-memory.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix villagers dont release memory
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/npc/Villager.java b/src/main/java/net/minecraft/world/entity/npc/Villager.java
-index 11935e5b16324af572b07c5b173708f5a91f8289..0b334ab58d723f27dae68974ed6ec5d64b10ad40 100644
+index 1aae466e3e334d7f4bbb3ea9365a255afcc3dd3a..82f52d90c38be29b788bef2a3bb520e4792de763 100644
 --- a/src/main/java/net/minecraft/world/entity/npc/Villager.java
 +++ b/src/main/java/net/minecraft/world/entity/npc/Villager.java
 @@ -1076,4 +1076,20 @@ public class Villager extends AbstractVillager implements ReputationEventHandler

patches/server/0100-Avoid-anvil-too-expensive.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Avoid anvil too expensive
 
 
 diff --git a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
-index f00638e9d7baf8b803dd610f2bf6250da34efab3..6ceb841fe5b415265cf3799d11c85f1ac9166601 100644
+index cab3e0ba471c93764b5949ad68a0f2cce4d00099..8c30f88b8c3d3e1823bfabd5dfa60592848ec8f0 100644
 --- a/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
 +++ b/src/main/java/net/minecraft/world/inventory/AnvilMenu.java
 @@ -293,7 +293,7 @@ public class AnvilMenu extends ItemCombinerMenu {

patches/server/0102-Zero-tick-plants.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Zero tick plants
 
 
 diff --git a/src/main/java/net/minecraft/world/level/block/BambooStalkBlock.java b/src/main/java/net/minecraft/world/level/block/BambooStalkBlock.java
-index 1dd85da8da9e2040d740c5f573e7438380f9a7a8..a7fd8a4a6eb252bac8641547cef3a76e47118fcc 100644
+index e8dc4ea90d74036dacb0785fcb9125df192a4c22..80284b01b7dc08659b4daf631ba820a4fc12411b 100644
 --- a/src/main/java/net/minecraft/world/level/block/BambooStalkBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/BambooStalkBlock.java
 @@ -122,8 +122,11 @@ public class BambooStalkBlock extends Block implements BonemealableBlock {
@@ -22,7 +22,7 @@ index 1dd85da8da9e2040d740c5f573e7438380f9a7a8..a7fd8a4a6eb252bac8641547cef3a76e
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/block/CactusBlock.java b/src/main/java/net/minecraft/world/level/block/CactusBlock.java
-index a9629a102c4fa4e5720e63fcf4590e9231426c62..b630f9c84e736bcc5d28e5ffd90bc47b2502d3de 100644
+index 232a3a0332d8d2c1ec625f3f2155316c69d95153..82dc22271ff425b228086e1e0da52404dc7cbb74 100644
 --- a/src/main/java/net/minecraft/world/level/block/CactusBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/CactusBlock.java
 @@ -46,8 +46,11 @@ public class CactusBlock extends Block {
@@ -56,7 +56,7 @@ index 0ab1bbd7c8dc8e45f754434357898d8fc990a021..107a3df31a77ff7d13e18691dc2c9602
  
      @Override
 diff --git a/src/main/java/net/minecraft/world/level/block/GrowingPlantHeadBlock.java b/src/main/java/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
-index 4ebdc4918131a15a1c91b45e8ceb1392bca20a81..b7941eb8819592adb003adc2c6acb49c5f2709dc 100644
+index 30300ef3ec839dfa944c992ab50db4d3859bb02e..0012973aafb19413d228119271c57cb620007292 100644
 --- a/src/main/java/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/GrowingPlantHeadBlock.java
 @@ -142,4 +142,15 @@ public abstract class GrowingPlantHeadBlock extends GrowingPlantBlock implements
@@ -76,7 +76,7 @@ index 4ebdc4918131a15a1c91b45e8ceb1392bca20a81..b7941eb8819592adb003adc2c6acb49c
 +    // Leaves end - zero tick plants
  }
 diff --git a/src/main/java/net/minecraft/world/level/block/SugarCaneBlock.java b/src/main/java/net/minecraft/world/level/block/SugarCaneBlock.java
-index ceaec1776067b7635c3952025f00f13f4ea86c88..81f8519b8d21d871ff3ddabb4a3674e8f35af82c 100644
+index 04957d461d0e968d443737068aaeec1d0bce78b2..5fabb71d01aadfddd9ddd0db2f93d08a8ad7a900 100644
 --- a/src/main/java/net/minecraft/world/level/block/SugarCaneBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/SugarCaneBlock.java
 @@ -46,8 +46,11 @@ public class SugarCaneBlock extends Block {

patches/server/0104-Force-peaceful-mode-switch.patch

@@ -78,7 +78,7 @@ index a3db45d411772d71ba46632633e935f2251bcfda..5c136b06599ddab0d42b9a8f63828748
  
                          if (true || this.level.shouldTickBlocksAt(chunkcoordintpair.toLong())) { // Paper - optimise chunk tick iteration
 diff --git a/src/main/java/net/minecraft/world/level/NaturalSpawner.java b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
-index 4eac3f2acaf70e83b9241ed55ae5f9ecf39d2e67..8faaf4a8bcd75c79808bcfd2b6b86729eebd8ee1 100644
+index 3e10668ca548472238bb4bb0a80a89f169a71496..aaea6e5701e23c5023bb990712bde7af23288ab1 100644
 --- a/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 +++ b/src/main/java/net/minecraft/world/level/NaturalSpawner.java
 @@ -133,6 +133,12 @@ public final class NaturalSpawner {

patches/server/0108-Leaves-I18n.patch

@@ -51,7 +51,7 @@ index 571fdf253ebc5cf2a3ec120c53293b37b770836d..800cadbb379cb90d5351c6d73f994713
          ImmutableMap.Builder<String, String> builder = ImmutableMap.builder();
          BiConsumer<String, String> biConsumer = builder::put;
 diff --git a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
-index 9229b76bb0bb87797cc3f5615d85fe2e5fd0c027..9c981632854acf2d26057882cb0b82812885b912 100644
+index 2882d720f2b4fbc5f00cfe45a80f48e7810c1424..693bbcd26ee7b286f045ed08cfa6ec0c5ae2c938 100644
 --- a/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/dedicated/DedicatedServer.java
 @@ -222,6 +222,7 @@ public class DedicatedServer extends MinecraftServer implements ServerInterface

patches/server/0110-Wool-Hopper-Counter.patch

@@ -19,7 +19,7 @@ index 7c29750e534eae4266bf7a63c50e3827401d6569..ab9a8c428975d016fbfa210b3a8cb531
      public ItemStack[] itemStacks;
      @Nullable
 diff --git a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
-index 62d1c35e78f84f561deea990b4938258a482fe39..0260b72aa06fb9e7260ece98832a56ea72dc4255 100644
+index 68612072f19745ca622b9604fc90867c9437e258..366b0233cee56a164f056ca596877357c492d614 100644
 --- a/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 +++ b/src/main/java/net/minecraft/world/level/block/entity/HopperBlockEntity.java
 @@ -444,6 +444,13 @@ public class HopperBlockEntity extends RandomizableContainerBlockEntity implemen

patches/server/0111-RNG-Fishing.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] RNG Fishing
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
-index 750802a734515758d00696eb207851958b4ab269..a695de87e8dcca151ba92ad961ffd1a9eed969e4 100644
+index c07801c2eba35cc97a3a967d6d6f3fb15e5a84af..d576bd2d2b6b38f0384bb2bc044f11ceebc65b97 100644
 --- a/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
 +++ b/src/main/java/net/minecraft/world/entity/projectile/FishingHook.java
 @@ -504,7 +504,7 @@ public class FishingHook extends Projectile {

patches/server/0113-Spider-jockeys-drop-gapples.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Spider jockeys drop gapples
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/monster/Spider.java b/src/main/java/net/minecraft/world/entity/monster/Spider.java
-index 9063f66b0497a3eb3893e307e685be692cc5c128..02b5bac9fd1687278e77a5a644b6b1ead33fc6ef 100644
+index 7618364e5373fe17cfe45a5a4ee9ab25e591581c..38dfa8b2018c43208b11006fe396c9d53f9cc5a5 100644
 --- a/src/main/java/net/minecraft/world/entity/monster/Spider.java
 +++ b/src/main/java/net/minecraft/world/entity/monster/Spider.java
 @@ -154,6 +154,18 @@ public class Spider extends Monster {

patches/server/0115-Servux-Protocol.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Servux Protocol
 
 
 diff --git a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
-index b52ac7c98e42d9e80c55bfb9ea562fcbf3c729d0..2b0937072cd3b3d59379781557844438eaefad2d 100644
+index 8d1b9391eb01ebf85d096e9c211629aef1034482..b78b712e9b28d17ad2632e652aa876a698f8b0bc 100644
 --- a/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 +++ b/src/main/java/net/minecraft/world/level/chunk/LevelChunk.java
 @@ -934,6 +934,7 @@ public class LevelChunk extends ChunkAccess {