diff --git a/sparklypaper-server/minecraft-patches/features/0006-Blazingly-Simple-Farm-Checks.patch b/sparklypaper-server/minecraft-patches/features/0006-Blazingly-Simple-Farm-Checks.patch
index 0bc920f..372b6cf 100644
--- a/sparklypaper-server/minecraft-patches/features/0006-Blazingly-Simple-Farm-Checks.patch
+++ b/sparklypaper-server/minecraft-patches/features/0006-Blazingly-Simple-Farm-Checks.patch
@@ -76,7 +76,7 @@ index bc0969f40814094e42a860a72314fccd1a66fabe..c14de811ae7cead820a00a87b9d2ce8c
          }
      }
 diff --git a/net/minecraft/world/level/block/FarmBlock.java b/net/minecraft/world/level/block/FarmBlock.java
-index 47c9b32c89e7e6f84a279c2f6098ada77dc58b6b..06a33e6f6118c2f2dce567efc2e23cbf877b7a9c 100644
+index 1fdede769b67cb5d2f9159c779f19e3639bb6ff5..1de42b2be50a5704a80c6cacc9e2cd82d0959bd6 100644
 --- a/net/minecraft/world/level/block/FarmBlock.java
 +++ b/net/minecraft/world/level/block/FarmBlock.java
 @@ -95,6 +95,19 @@ public class FarmBlock extends Block {
@@ -99,7 +99,7 @@ index 47c9b32c89e7e6f84a279c2f6098ada77dc58b6b..06a33e6f6118c2f2dce567efc2e23cbf
          if (moistureValue > 0 && level.paperConfig().tickRates.wetFarmland != 1 && (level.paperConfig().tickRates.wetFarmland < 1 || (net.minecraft.server.MinecraftServer.currentTick + pos.hashCode()) % level.paperConfig().tickRates.wetFarmland != 0)) { return; } // Paper - Configurable random tick rates for blocks
          if (moistureValue == 0 && level.paperConfig().tickRates.dryFarmland != 1 && (level.paperConfig().tickRates.dryFarmland < 1 || (net.minecraft.server.MinecraftServer.currentTick + pos.hashCode()) % level.paperConfig().tickRates.dryFarmland != 0)) { return; } // Paper - Configurable random tick rates for blocks
          if (!isNearWater(level, pos) && !level.isRainingAt(pos.above())) {
-@@ -154,7 +167,7 @@ public class FarmBlock extends Block {
+@@ -157,7 +170,7 @@ public class FarmBlock extends Block {
          return level.getBlockState(pos.above()).is(BlockTags.MAINTAINS_FARMLAND);
      }
  
diff --git a/sparklypaper-server/minecraft-patches/features/0018-Parallel-world-ticking.patch b/sparklypaper-server/minecraft-patches/features/0018-Parallel-world-ticking.patch
index 5e024d2..db2cdf5 100644
--- a/sparklypaper-server/minecraft-patches/features/0018-Parallel-world-ticking.patch
+++ b/sparklypaper-server/minecraft-patches/features/0018-Parallel-world-ticking.patch
@@ -366,7 +366,7 @@ index 6ac73610f6039290c4ef3dde2206b6863d2b5067..0c5dbfe1d7e17796c1a60bcb1f97673d
          halloweenManager.startHalloweenEpochTask();
          halloweenManager.waitUntilEpochHasBeenUpdated();
 diff --git a/net/minecraft/server/level/ServerLevel.java b/net/minecraft/server/level/ServerLevel.java
-index 229dc5bf756b04896ab6567e79811ef81e416eb8..f26751633b809cdf86f512529ebf8b0a2ba66b46 100644
+index 3bdd68f6fd3f6558276774064f021936fa00729e..0ee5bb3665ba097acd08386e1b0c4cdbdbd02bc2 100644
 --- a/net/minecraft/server/level/ServerLevel.java
 +++ b/net/minecraft/server/level/ServerLevel.java
 @@ -184,7 +184,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
@@ -412,7 +412,7 @@ index 229dc5bf756b04896ab6567e79811ef81e416eb8..f26751633b809cdf86f512529ebf8b0a
          }
          // Paper end - rewrite chunk system
  
-@@ -1497,6 +1499,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1499,6 +1501,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
      }
  
      private void addPlayer(ServerPlayer player) {
@@ -420,7 +420,7 @@ index 229dc5bf756b04896ab6567e79811ef81e416eb8..f26751633b809cdf86f512529ebf8b0a
          Entity entity = this.getEntities().get(player.getUUID());
          if (entity != null) {
              LOGGER.warn("Force-added player with duplicate UUID {}", player.getUUID());
-@@ -1509,7 +1512,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
+@@ -1511,7 +1514,7 @@ public class ServerLevel extends Level implements ServerEntityGetter, WorldGenLe
  
      // CraftBukkit start
      private boolean addEntity(Entity entity, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason spawnReason) {
@@ -535,10 +535,10 @@ index 5a4960fdbd97d830ac79845697eea9372c48a13b..76c17bc3425a081a0d691a10525f91b3
          serverPlayer.connection = player.connection;
          serverPlayer.restoreFrom(player, keepInventory);
 diff --git a/net/minecraft/world/entity/Entity.java b/net/minecraft/world/entity/Entity.java
-index b268b428ec8f2e50737e1dd5cc705c537322433c..d1109555e6cdd9cf9214df90c31c3a8497a253c2 100644
+index 1b54cf07616a10d93e9336dbd299ba5f09678a28..9548ccc63eebaca1a9ccdd504bdfb4f04e024544 100644
 --- a/net/minecraft/world/entity/Entity.java
 +++ b/net/minecraft/world/entity/Entity.java
-@@ -818,7 +818,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -819,7 +819,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      // CraftBukkit start
      public void postTick() {
          // No clean way to break out of ticking once the entity has been copied to a new world, so instead we move the portalling later in the tick cycle
@@ -547,7 +547,7 @@ index b268b428ec8f2e50737e1dd5cc705c537322433c..d1109555e6cdd9cf9214df90c31c3a84
              this.handlePortal();
          }
      }
-@@ -3804,6 +3804,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3805,6 +3805,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      private Entity teleportCrossDimension(ServerLevel level, TeleportTransition teleportTransition) {
diff --git a/sparklypaper-server/minecraft-patches/features/0020-SPARKLYPOWER-Remap-SparklyPower-hacky-legacy-NBT-tag.patch b/sparklypaper-server/minecraft-patches/features/0019-SPARKLYPOWER-Remap-SparklyPower-hacky-legacy-NBT-tag.patch
similarity index 100%
rename from sparklypaper-server/minecraft-patches/features/0020-SPARKLYPOWER-Remap-SparklyPower-hacky-legacy-NBT-tag.patch
rename to sparklypaper-server/minecraft-patches/features/0019-SPARKLYPOWER-Remap-SparklyPower-hacky-legacy-NBT-tag.patch
diff --git a/sparklypaper-server/minecraft-patches/features/0021-SPARKLYPOWER-Add-custom-blocks.patch b/sparklypaper-server/minecraft-patches/features/0020-SPARKLYPOWER-Add-custom-blocks.patch
similarity index 100%
rename from sparklypaper-server/minecraft-patches/features/0021-SPARKLYPOWER-Add-custom-blocks.patch
rename to sparklypaper-server/minecraft-patches/features/0020-SPARKLYPOWER-Add-custom-blocks.patch
diff --git a/sparklypaper-server/minecraft-patches/features/0019-Add-EntityGetProjectileForWeaponEvent.patch b/sparklypaper-server/minecraft-patches/features/0021-Add-EntityGetProjectileForWeaponEvent.patch
similarity index 85%
rename from sparklypaper-server/minecraft-patches/features/0019-Add-EntityGetProjectileForWeaponEvent.patch
rename to sparklypaper-server/minecraft-patches/features/0021-Add-EntityGetProjectileForWeaponEvent.patch
index 4fc8805..fd0a470 100644
--- a/sparklypaper-server/minecraft-patches/features/0019-Add-EntityGetProjectileForWeaponEvent.patch
+++ b/sparklypaper-server/minecraft-patches/features/0021-Add-EntityGetProjectileForWeaponEvent.patch
@@ -1,6 +1,6 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
 From: MrPowerGamerBR <git@mrpowergamerbr.com>
-Date: Fri, 17 Jan 2025 12:37:40 -0300
+Date: Sun, 23 Feb 2025 18:53:43 -0300
 Subject: [PATCH] Add EntityGetProjectileForWeaponEvent
 
 
@@ -22,10 +22,10 @@ index d0d3c825cf8088df4794cf5bfde12a69f4d71754..4cad07ae00eb34b51b8ef3f25f0abf8e
              ItemStack heldProjectile = ProjectileWeaponItem.getHeldProjectile(this, supportedHeldProjectiles);
              return heldProjectile.isEmpty() ? new ItemStack(Items.ARROW) : heldProjectile;
 diff --git a/net/minecraft/world/entity/player/Player.java b/net/minecraft/world/entity/player/Player.java
-index 3ae542153bf1538d17e7c0fe6acc9e7f8605750c..266a91a6d0300ce8f78bf3e1a8998a97a65c9deb 100644
+index a0813aa9ebf5b32375b1bc9f294d8fc34cc867fe..3e89356b177b5033fb58de314b0cb0f591ec4e5b 100644
 --- a/net/minecraft/world/entity/player/Player.java
 +++ b/net/minecraft/world/entity/player/Player.java
-@@ -2234,6 +2234,12 @@ public abstract class Player extends LivingEntity {
+@@ -2239,6 +2239,12 @@ public abstract class Player extends LivingEntity {
          if (!(shootable.getItem() instanceof ProjectileWeaponItem)) {
              return ItemStack.EMPTY;
          } else {
@@ -35,6 +35,6 @@ index 3ae542153bf1538d17e7c0fe6acc9e7f8605750c..266a91a6d0300ce8f78bf3e1a8998a97
 +            if (event.getArrow() != null)
 +                return org.bukkit.craftbukkit.inventory.CraftItemStack.asNMSCopy(event.getArrow());
 +            // SparklyPaper end
-             Predicate<ItemStack> supportedHeldProjectiles = ((ProjectileWeaponItem)shootable.getItem()).getSupportedHeldProjectiles().and(item -> this.tryReadyArrow(shootable, item)); // Paper - PlayerReadyArrowEvent
+             final org.apache.commons.lang3.mutable.MutableBoolean anyEventCancelled = new org.apache.commons.lang3.mutable.MutableBoolean(); // Paper - PlayerReadyArrowEvent
+             Predicate<ItemStack> supportedHeldProjectiles = ((ProjectileWeaponItem)shootable.getItem()).getSupportedHeldProjectiles().and(item -> this.tryReadyArrow(shootable, item, anyEventCancelled)); // Paper - PlayerReadyArrowEvent
              ItemStack heldProjectile = ProjectileWeaponItem.getHeldProjectile(this, supportedHeldProjectiles);
-             if (!heldProjectile.isEmpty()) {