diff --git a/patches/api/0010-Smooth-Teleports.patch b/patches/api/0010-Smooth-Teleports.patch
index 9bd4d2718..6dee2421b 100644
--- a/patches/api/0010-Smooth-Teleports.patch
+++ b/patches/api/0010-Smooth-Teleports.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Smooth Teleports
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 06f00d016f1e46edb8f4fe0c14eb8b364900c3ef..bff6dcf37d451e1521737326d255082cb0e32ad6 100644
+index d0297f47f18cabf857cf4ce04c529b46525c0f75..53ac8be977419763206339b2c6ff64d8753f8bcb 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2999,6 +2999,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3035,6 +3035,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      String getClientBrandName();
      // Paper end
  
diff --git a/patches/api/0011-AntiXray-Bypass.patch b/patches/api/0011-AntiXray-Bypass.patch
index e0f341f9b..46e1f4b99 100644
--- a/patches/api/0011-AntiXray-Bypass.patch
+++ b/patches/api/0011-AntiXray-Bypass.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] AntiXray Bypass
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index bff6dcf37d451e1521737326d255082cb0e32ad6..c84fbb2e325e019b20fbfae8beb2235016479fda 100644
+index 53ac8be977419763206339b2c6ff64d8753f8bcb..e4a7771944fc9ec199764e89a7d05437a206fe4c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2804,6 +2804,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2836,6 +2836,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      boolean hasResourcePack();
  
diff --git a/patches/api/0013-Equipment-Packet-Caching.patch b/patches/api/0013-Equipment-Packet-Caching.patch
index 0907aa330..29492e602 100644
--- a/patches/api/0013-Equipment-Packet-Caching.patch
+++ b/patches/api/0013-Equipment-Packet-Caching.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Equipment Packet Caching
 
 
 diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
-index 9712f7140933d7fc87c5838c173e2d818b70cfde..d7810b4285ed2b5f51285e740af5d03f5b67144f 100644
+index 19e58e62ae442ef9be02ca7fa2f55e370a54afa4..94aafbc3a08dec7c66cef89de7a5283049a4bf05 100644
 --- a/src/main/java/org/bukkit/entity/LivingEntity.java
 +++ b/src/main/java/org/bukkit/entity/LivingEntity.java
-@@ -1159,4 +1159,11 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
+@@ -1192,4 +1192,11 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
       */
      void setBodyYaw(float bodyYaw);
      // Paper end
diff --git a/patches/server/0001-Build-Changes.patch b/patches/server/0001-Build-Changes.patch
index cb1cc6e2b..a715790c3 100644
--- a/patches/server/0001-Build-Changes.patch
+++ b/patches/server/0001-Build-Changes.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Build Changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 6d3d573ffc118e7f4d76422dc014a7df0384bb49..6e5a7cd4028d38126632390e129c005dae158877 100644
+index 57f2c414dbfe127c193002fbc8eeb22e94e9cb55..25ec51f3d299414cd122b3f125a67a86df7a3d73 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -7,8 +7,12 @@ plugins {
- }
+@@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
+ val alsoShade: Configuration by configurations.creating
  
  dependencies {
 -    implementation(project(":paper-api"))
@@ -23,7 +23,7 @@ index 6d3d573ffc118e7f4d76422dc014a7df0384bb49..6e5a7cd4028d38126632390e129c005d
      // Paper start
      implementation("org.jline:jline-terminal-jansi:3.21.0")
      implementation("net.minecrell:terminalconsoleappender:1.3.0")
-@@ -64,7 +68,7 @@ tasks.jar {
+@@ -72,7 +76,7 @@ tasks.jar {
          attributes(
              "Main-Class" to "org.bukkit.craftbukkit.Main",
              "Implementation-Title" to "CraftBukkit",
@@ -32,7 +32,7 @@ index 6d3d573ffc118e7f4d76422dc014a7df0384bb49..6e5a7cd4028d38126632390e129c005d
              "Implementation-Vendor" to date, // Paper
              "Specification-Title" to "Bukkit",
              "Specification-Version" to project.version,
-@@ -136,7 +140,7 @@ fun TaskContainer.registerRunTask(
+@@ -149,7 +153,7 @@ fun TaskContainer.registerRunTask(
      name: String,
      block: JavaExec.() -> Unit
  ): TaskProvider<JavaExec> = register<JavaExec>(name) {
@@ -55,10 +55,10 @@ index 3238cbcba567b1242c77e41f6b6f19a8d157fb4e..681123682c1a0060d05860835e5b9f46
  
      public SystemReport fillSystemReport(SystemReport details) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0859f11567aecc8cae993a1409cfac7c53ab3dd5..83c0591f044099c02763b04e2f2c8155bfcdfc13 100644
+index a05c1bc8874ef5e380544a6a344c848e37da49c4..690a3ae95696b20fe3dc8f2567311a3ed4b5abc9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -261,7 +261,7 @@ import javax.annotation.Nullable; // Paper
+@@ -264,7 +264,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
diff --git a/patches/server/0003-Add-BlockDestroyedByNeighborEvent.patch b/patches/server/0003-Add-BlockDestroyedByNeighborEvent.patch
index 7ea7c79ec..e975f4fcc 100644
--- a/patches/server/0003-Add-BlockDestroyedByNeighborEvent.patch
+++ b/patches/server/0003-Add-BlockDestroyedByNeighborEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add BlockDestroyedByNeighborEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 1635fee928d64f4d2c336dca6675ed4641918830..8e09fa09ad5171c49d66cd890f37ca59e2962f94 100644
+index 34ecfb89372f459117db99d57a7edd6f681bbe8a..35d83c8ebfbf968943d103b520e0f3a83ed0ebe9 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -419,6 +419,7 @@ public class ServerPlayerGameMode {
@@ -25,7 +25,7 @@ index 1635fee928d64f4d2c336dca6675ed4641918830..8e09fa09ad5171c49d66cd890f37ca59
                      org.bukkit.craftbukkit.event.CraftEventFactory.handleBlockDropItemEvent(bblock, state, this.player, itemsToDrop); // Paper - use stored ref
                  }
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index adb7220be617d6d9f2cdd7fbe4fa2dd24cc7d142..79ce85f7f3471bab9bd647848836670c3de38a9a 100644
+index ae9b821d71d2868ba4eb3c73558fdcd6caf264e3..14c04a8b9b772dc4167261edfb736407b0b867a9 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
 @@ -360,6 +360,7 @@ public final class ItemStack {
@@ -33,7 +33,7 @@ index adb7220be617d6d9f2cdd7fbe4fa2dd24cc7d142..79ce85f7f3471bab9bd647848836670c
              }
              Item item = this.getItem();
 +            if (entityhuman != null) world.pendingPlayerBlockEvents.put(blockposition, new Level.PendingBlockEvent(blockposition, entityhuman)); // Paper
-             InteractionResult enuminteractionresult = item.useOn(itemactioncontext);
+             InteractionResult enuminteractionresult = item.useOn(context);
              CompoundTag newData = this.getTagClone();
              int newCount = this.getCount();
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
diff --git a/patches/server/0007-Add-PlayerData-Events.patch b/patches/server/0007-Add-PlayerData-Events.patch
index 8c50c707c..117598c10 100644
--- a/patches/server/0007-Add-PlayerData-Events.patch
+++ b/patches/server/0007-Add-PlayerData-Events.patch
@@ -5,11 +5,11 @@ Subject: [PATCH] Add PlayerData Events
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
-index 8e09fa09ad5171c49d66cd890f37ca59e2962f94..74eaa6be9676d3e4bc2cd71de84b2d3defa95ce2 100644
+index 35d83c8ebfbf968943d103b520e0f3a83ed0ebe9..3364749824b35ecc81f17595627793b486f1e05b 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayerGameMode.java
 @@ -601,6 +601,8 @@ public class ServerPlayerGameMode {
-                     enuminteractionresult1 = stack.useOn(itemactioncontext, hand);
+                     enuminteractionresult1 = stack.useOn(itemactioncontext);
                  }
  
 +                world.pendingPlayerBlockEvents.remove(blockposition); // Paper
diff --git a/patches/server/0010-Smooth-Teleports.patch b/patches/server/0010-Smooth-Teleports.patch
index f892faece..a44e03be8 100644
--- a/patches/server/0010-Smooth-Teleports.patch
+++ b/patches/server/0010-Smooth-Teleports.patch
@@ -36,10 +36,10 @@ index 04d8f26e760e893ed9b30f6fc56e6753871d1d47..f42bcc36b6aae2560cebb9ceeab69577
  
          // entityplayer1.connection.teleport(entityplayer1.getX(), entityplayer1.getY(), entityplayer1.getZ(), entityplayer1.getYRot(), entityplayer1.getXRot());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 59c00045ec903a635966f16cf33e5b4110262953..e34f06f3d730932abbc7b9aada6139a4a06b170d 100644
+index 5b201d2c21f04e0223970035e0631f8f92ea0d3a..a39ca2dc5c57fecc5df2b6dd8918f6943af04487 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1239,6 +1239,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1245,6 +1245,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          // Paper end
      }
  
diff --git a/patches/server/0011-Ignore-durability-changes-for-equipment-updates.patch b/patches/server/0011-Ignore-durability-changes-for-equipment-updates.patch
index b0daae559..f324238ac 100644
--- a/patches/server/0011-Ignore-durability-changes-for-equipment-updates.patch
+++ b/patches/server/0011-Ignore-durability-changes-for-equipment-updates.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Ignore durability changes for equipment updates
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 064bd3f2615009b3f15f3a5006f0b5f7a7ba6bf5..523e2864b49fc5501646482ea15694fd05cb0b9f 100644
+index e11d7283662834047b2ff81a2fd25a4263792deb..d0e49ae973a91344f3973dc6e00e7e6c649e87cb 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3137,7 +3137,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3127,7 +3127,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      public boolean equipmentHasChanged(ItemStack stack, ItemStack stack2) {
diff --git a/patches/server/0013-AntiXray-Bypass.patch b/patches/server/0013-AntiXray-Bypass.patch
index c5a8bd689..f45a5c846 100644
--- a/patches/server/0013-AntiXray-Bypass.patch
+++ b/patches/server/0013-AntiXray-Bypass.patch
@@ -17,10 +17,10 @@ index 42fdce97d99618a53f2e9c51804ff2205b574f69..7e8d58e3481be2d7ebbe5fe388d61932
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e34f06f3d730932abbc7b9aada6139a4a06b170d..5a54df1983721d8dcc368956c88e02109bbb4c80 100644
+index a39ca2dc5c57fecc5df2b6dd8918f6943af04487..e77beae68b89f4cc66eb5564933dea3c363e93e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -188,6 +188,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -194,6 +194,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private static final boolean DISABLE_CHANNEL_LIMIT = System.getProperty("paper.disableChannelLimit") != null; // Paper - add a flag to disable the channel limit
      private long lastSaveTime;
      // Paper end
@@ -28,7 +28,7 @@ index e34f06f3d730932abbc7b9aada6139a4a06b170d..5a54df1983721d8dcc368956c88e0210
  
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
          super(server, entity);
-@@ -2711,6 +2712,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2740,6 +2741,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
      // Paper end
  
diff --git a/patches/server/0026-Add-jackson.patch b/patches/server/0026-Add-jackson.patch
index da3d93cbf..7204f1787 100644
--- a/patches/server/0026-Add-jackson.patch
+++ b/patches/server/0026-Add-jackson.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add jackson
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 9387d8fdb70e882104155abb284cba129d20585e..9342475e878978af75d7ea7aa125acfbe40bc28c 100644
+index 25ec51f3d299414cd122b3f125a67a86df7a3d73..4ae0234060c33952760c298bff343370aba3ab1a 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
-@@ -13,6 +13,13 @@ dependencies {
+@@ -19,6 +19,13 @@ dependencies {
          exclude("io.papermc.paper", "paper-api")
      }
      // Slice end
diff --git a/patches/server/0027-Maybe-can-t-tostring.patch b/patches/server/0027-Maybe-can-t-tostring.patch
index 3a04071a8..b53df4101 100644
--- a/patches/server/0027-Maybe-can-t-tostring.patch
+++ b/patches/server/0027-Maybe-can-t-tostring.patch
@@ -19,10 +19,10 @@ index 7e94ebe06fc62293e665d6db19e42d947e7eb30f..158c012b8a6808ca0f820c2997af2825
          java.util.Iterator<java.util.Map.Entry<String, Tag>> iterator = (this.tags instanceof it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap) ? ((it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap)this.tags).object2ObjectEntrySet().fastIterator() : this.tags.entrySet().iterator();
          while (iterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 79ce85f7f3471bab9bd647848836670c3de38a9a..947a4f20b5fc4ef9bdd8d50a2d6d457e5d7c5ed8 100644
+index 14c04a8b9b772dc4167261edfb736407b0b867a9..461260d6e42b924dca7d62766c01ca3782b1557f 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -731,7 +731,11 @@ public final class ItemStack {
+@@ -732,7 +732,11 @@ public final class ItemStack {
  
              itemstack.setPopTime(this.getPopTime());
              if (this.tag != null) {
diff --git a/patches/server/0029-Packet-obfuscation-and-reduction.patch b/patches/server/0029-Packet-obfuscation-and-reduction.patch
index b74ea6119..59105bf71 100644
--- a/patches/server/0029-Packet-obfuscation-and-reduction.patch
+++ b/patches/server/0029-Packet-obfuscation-and-reduction.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Packet obfuscation and reduction
 
 
 diff --git a/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java b/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java
-index 15add3f4dfd718ec09bb1db4f22223466936879c..f4319b98e114c4f3e84b9977d48a98c20f96c853 100644
+index 5dfb35117c285e0b202dc9c088ad5848beb8d054..b3d2cbf9f60c4a4b34df20bfe45a80ac23f4570f 100644
 --- a/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java
 +++ b/src/main/java/net/minecraft/network/syncher/SynchedEntityData.java
-@@ -143,15 +143,29 @@ public class SynchedEntityData {
+@@ -165,15 +165,29 @@ public class SynchedEntityData {
      }
  
      public <T> void set(EntityDataAccessor<T> key, T value, boolean force) {
@@ -39,7 +39,7 @@ index 15add3f4dfd718ec09bb1db4f22223466936879c..f4319b98e114c4f3e84b9977d48a98c2
      }
  
      // CraftBukkit start - add method from above
-@@ -193,6 +207,26 @@ public class SynchedEntityData {
+@@ -215,6 +229,26 @@ public class SynchedEntityData {
          return list;
      }
  
@@ -66,7 +66,7 @@ index 15add3f4dfd718ec09bb1db4f22223466936879c..f4319b98e114c4f3e84b9977d48a98c2
      @Nullable
      public List<SynchedEntityData.DataValue<?>> getNonDefaultValues() {
          List<SynchedEntityData.DataValue<?>> list = null;
-@@ -314,11 +348,14 @@ public class SynchedEntityData {
+@@ -336,11 +370,14 @@ public class SynchedEntityData {
          T value;
          private final T initialValue;
          private boolean dirty;
@@ -81,7 +81,7 @@ index 15add3f4dfd718ec09bb1db4f22223466936879c..f4319b98e114c4f3e84b9977d48a98c2
          }
  
          public EntityDataAccessor<T> getAccessor() {
-@@ -348,6 +385,35 @@ public class SynchedEntityData {
+@@ -370,6 +407,35 @@ public class SynchedEntityData {
          public SynchedEntityData.DataValue<T> value() {
              return SynchedEntityData.DataValue.create(this.accessor, this.value);
          }
@@ -118,10 +118,10 @@ index 15add3f4dfd718ec09bb1db4f22223466936879c..f4319b98e114c4f3e84b9977d48a98c2
  
      public static record DataValue<T>(int id, EntityDataSerializer<T> serializer, T value) { // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index 6670e657e08e130f7e0368f418379fd1ece00cdf..a3cff8bcc0e390865563c97c95f4e28e99a83948 100644
+index 81d0b2933040a451441f660f9e46199ae3b111e3..516fcc67aa83a870b74372742b81d0acef242655 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -380,7 +380,20 @@ public class ServerEntity {
+@@ -375,7 +375,20 @@ public class ServerEntity {
  
          if (list != null) {
              this.trackedDataValues = datawatcher.getNonDefaultValues();
@@ -144,10 +144,10 @@ index 6670e657e08e130f7e0368f418379fd1ece00cdf..a3cff8bcc0e390865563c97c95f4e28e
  
          if (this.entity instanceof LivingEntity) {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 8c2b633bef56d4cf52d33827df5bc301bbe2c6bd..b73e4f37884d58832e8fb7a2634aa3ddf0a0bb9a 100644
+index 819ed80a563b84c5ced68623090ee5dbf7b12749..3562a973aa65862d9525efd74e256eec2f8bf2fd 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3288,7 +3288,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3271,7 +3271,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              this.entityData.markDirty(Entity.DATA_AIR_SUPPLY_ID);
              return;
          }
@@ -157,10 +157,10 @@ index 8c2b633bef56d4cf52d33827df5bc301bbe2c6bd..b73e4f37884d58832e8fb7a2634aa3dd
      }
  
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 523e2864b49fc5501646482ea15694fd05cb0b9f..3d86de5060becac4936a36806fb4e73e38ea0187 100644
+index d0e49ae973a91344f3973dc6e00e7e6c649e87cb..b7c9876eaff4365d136a9af20c1a5845b3094336 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -3137,7 +3137,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3127,7 +3127,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
      }
  
      public boolean equipmentHasChanged(ItemStack stack, ItemStack stack2) {
@@ -183,10 +183,10 @@ index 38e110a226aac27d86dfe89bc0e9ecaada6ff268..15515e871c89498ec936ab24871741f8
  
      public void startAutoSpinAttack(int riptideTicks) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 5a54df1983721d8dcc368956c88e02109bbb4c80..ced211abb09de42057ca01e9413c183d3cf6193e 100644
+index e77beae68b89f4cc66eb5564933dea3c363e93e2..3ccd9d56373ffcab73b8356d7a3542615b2d44ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2476,7 +2476,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2506,7 +2506,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  this.sendHealthUpdate();
              }
          }
diff --git a/patches/server/0031-Shared-Data-Storage.patch b/patches/server/0031-Shared-Data-Storage.patch
index 2116fc46a..565d52f4b 100644
--- a/patches/server/0031-Shared-Data-Storage.patch
+++ b/patches/server/0031-Shared-Data-Storage.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Shared Data Storage
 
 
 diff --git a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
-index ffbab76e55807f04ebb25242eadbea114004b1b3..fa2581c014d839195775aacf10b8e684cb60140f 100644
+index 4ac3fa45cd155ae8a852e26d4d4d1f16b28efdc2..b89e3568cc9371984fe1cd8f83008a9250956465 100644
 --- a/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 +++ b/src/main/java/io/papermc/paper/configuration/GlobalConfiguration.java
 @@ -270,6 +270,7 @@ public class GlobalConfiguration extends ConfigurationPart {
@@ -15,9 +15,9 @@ index ffbab76e55807f04ebb25242eadbea114004b1b3..fa2581c014d839195775aacf10b8e684
 +        public String sharedDataFolder = "";
      }
  
-     public ChunkLoadingBasic chunkLoadingBasic;
+     public BlockUpdates blockUpdates;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d15b822d7b12691608a3890d87b09c7562f91958..b6911bf0a72a7f96a4baaa70a72310d57ef480c8 100644
+index 681123682c1a0060d05860835e5b9f46147f7c1f..619956817b5fccb74a6d68d5e3ea1b317c69b779 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
diff --git a/patches/server/0032-Equipment-Packet-Caching.patch b/patches/server/0032-Equipment-Packet-Caching.patch
index e6b306179..3a98222cd 100644
--- a/patches/server/0032-Equipment-Packet-Caching.patch
+++ b/patches/server/0032-Equipment-Packet-Caching.patch
@@ -25,7 +25,7 @@ index 5a8f850b447fc3a4bd0eb0c505bbdfc8be7115e8..34d74735b7a7d258c6bd14bb7e540693
          this.entity = buf.readVarInt();
          EquipmentSlot[] equipmentSlots = EquipmentSlot.values();
 diff --git a/src/main/java/net/minecraft/server/level/ServerEntity.java b/src/main/java/net/minecraft/server/level/ServerEntity.java
-index a3cff8bcc0e390865563c97c95f4e28e99a83948..53efe944288b6d58700242eaca97119a6aa77bc0 100644
+index 516fcc67aa83a870b74372742b81d0acef242655..07febce429ebd15656e8483d2d2af9e93c13de19 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
 @@ -328,27 +328,8 @@ public class ServerEntity {
@@ -57,12 +57,12 @@ index a3cff8bcc0e390865563c97c95f4e28e99a83948..53efe944288b6d58700242eaca97119a
 +            livingEntity.sendEquipment(sender, player); // Slice
          }
  
-         // CraftBukkit start - Fix for nonsensical head yaw
+         if (!this.entity.getPassengers().isEmpty()) {
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 3d86de5060becac4936a36806fb4e73e38ea0187..a13576b096322eccef4643c5aa5a33fe74f479d5 100644
+index b7c9876eaff4365d136a9af20c1a5845b3094336..a5165d76d8495242708093f7e4449f6f67386ad7 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-@@ -264,6 +264,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -263,6 +263,8 @@ public abstract class LivingEntity extends Entity implements Attackable {
      public org.bukkit.craftbukkit.entity.CraftLivingEntity getBukkitLivingEntity() { return (org.bukkit.craftbukkit.entity.CraftLivingEntity) super.getBukkitEntity(); } // Paper
      public boolean silentDeath = false; // Paper - mark entity as dying silently for cancellable death event
      public net.kyori.adventure.util.TriState frictionState = net.kyori.adventure.util.TriState.NOT_SET; // Paper
@@ -71,7 +71,7 @@ index 3d86de5060becac4936a36806fb4e73e38ea0187..a13576b096322eccef4643c5aa5a33fe
  
      @Override
      public float getBukkitYaw() {
-@@ -3081,6 +3083,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3071,6 +3073,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
          if (map != null) {
              this.handleHandSwap(map);
              if (!map.isEmpty()) {
@@ -79,7 +79,7 @@ index 3d86de5060becac4936a36806fb4e73e38ea0187..a13576b096322eccef4643c5aa5a33fe
                  this.handleEquipmentChanges(map);
              }
          }
-@@ -3173,7 +3176,25 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -3163,7 +3166,25 @@ public abstract class LivingEntity extends Entity implements Attackable {
              }
  
          });
@@ -106,7 +106,7 @@ index 3d86de5060becac4936a36806fb4e73e38ea0187..a13576b096322eccef4643c5aa5a33fe
      }
  
      // Paper start - hide unnecessary item meta
-@@ -4460,4 +4481,74 @@ public abstract class LivingEntity extends Entity implements Attackable {
+@@ -4450,4 +4471,74 @@ public abstract class LivingEntity extends Entity implements Attackable {
      public static record Fallsounds(SoundEvent small, SoundEvent big) {
  
      }
@@ -182,10 +182,10 @@ index 3d86de5060becac4936a36806fb4e73e38ea0187..a13576b096322eccef4643c5aa5a33fe
 +    // Slice end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 19212795df4024cfb2b9f56e1efcd4c9f20d1d83..59646fd15c90407b1a7bfe5c0b2a87ac2b10b356 100644
+index 6095d43e08bc1ffc4e9a4796fc7adbd07d69d716..8c29e292b8e495ca64668c6a22b9765ffe836a08 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1072,4 +1072,14 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1099,4 +1099,14 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          getHandle().knockback(strength, directionX, directionZ);
      };
      // Paper end