diff --git a/gradle.properties b/gradle.properties
index b94a8bd1c..a53ba456c 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=com.lokamc.slice
 version=1.20.1-R0.1-SNAPSHOT
 
 mcVersion=1.20.1
-paperRef=f402f89a67bfdbcbe302733a0e62b064888b0f6f
+paperRef=281855c877cf4e78a8a4918c5d89cdab2c5c0861
 
 org.gradle.caching=true
 org.gradle.parallel=true
diff --git a/patches/api/0009-Set-multiple-team-settings-at-once.patch b/patches/api/0009-Set-multiple-team-settings-at-once.patch
index 440149b0b..eb43e7473 100644
--- a/patches/api/0009-Set-multiple-team-settings-at-once.patch
+++ b/patches/api/0009-Set-multiple-team-settings-at-once.patch
@@ -5,12 +5,12 @@ Subject: [PATCH] Set multiple team settings at once
 
 
 diff --git a/src/main/java/org/bukkit/scoreboard/Team.java b/src/main/java/org/bukkit/scoreboard/Team.java
-index 0f1c08092577a7d66fdc1ea8b645ea67e0d9c6cf..f1b3d05901a4fe32366699280f44147a9cda2873 100644
+index 8424fdac153f6dea76acce89f4726408d9726c41..6effaeaf885d70f8aeb11b5c44e7f3ab42cf2a90 100644
 --- a/src/main/java/org/bukkit/scoreboard/Team.java
 +++ b/src/main/java/org/bukkit/scoreboard/Team.java
-@@ -532,6 +532,24 @@ public interface Team {
+@@ -514,6 +514,24 @@ public interface Team {
      boolean hasEntity(@NotNull org.bukkit.entity.Entity entity) throws IllegalStateException, IllegalArgumentException;
-     // Paper end
+     // Paper end - improve scoreboard entries
  
 +    //Slice start
 +    /**
diff --git a/patches/api/0010-Smooth-Teleports.patch b/patches/api/0010-Smooth-Teleports.patch
index 6dee2421b..a1f8dfe44 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 d0297f47f18cabf857cf4ce04c529b46525c0f75..53ac8be977419763206339b2c6ff64d8753f8bcb 100644
+index f9dd00210c1762a40259f823aeb8d8a5ddc78e3e..bb0c49ed971d71904b9172cac2e724133754f32c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -3035,6 +3035,19 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -3153,6 +3153,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 46e1f4b99..57770ecde 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 53ac8be977419763206339b2c6ff64d8753f8bcb..e4a7771944fc9ec199764e89a7d05437a206fe4c 100644
+index bb0c49ed971d71904b9172cac2e724133754f32c..8fc53e32d09f1678d59da0d01f28b6ef96527011 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -2836,6 +2836,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -2950,6 +2950,10 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      boolean hasResourcePack();
  
diff --git a/patches/server/0001-Build-Changes.patch b/patches/server/0001-Build-Changes.patch
index a715790c3..f554047a5 100644
--- a/patches/server/0001-Build-Changes.patch
+++ b/patches/server/0001-Build-Changes.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Build Changes
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 57f2c414dbfe127c193002fbc8eeb22e94e9cb55..25ec51f3d299414cd122b3f125a67a86df7a3d73 100644
+index fb98936bb8a5488db75d676c5bcb4060597fbbf8..2e1cea360bb6ff85eb8da54237bc407653eb91f6 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -13,8 +13,12 @@ configurations.named(log4jPlugins.compileClasspathConfigurationName) {
@@ -42,7 +42,7 @@ index 57f2c414dbfe127c193002fbc8eeb22e94e9cb55..25ec51f3d299414cd122b3f125a67a86
      standardInput = System.`in`
      workingDir = rootProject.layout.projectDirectory
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3238cbcba567b1242c77e41f6b6f19a8d157fb4e..681123682c1a0060d05860835e5b9f46147f7c1f 100644
+index 435f5ee3388f5da93df938c43ea2578f7d586407..ac1cb065ace9198e7e8fe65b3225d0caf456b9dc 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1693,7 +1693,7 @@ public abstract class MinecraftServer extends ReentrantBlockableEventLoop<TickTa
@@ -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 a05c1bc8874ef5e380544a6a344c848e37da49c4..690a3ae95696b20fe3dc8f2567311a3ed4b5abc9 100644
+index ec4b73321205b472f19fa5bd4ad95893020d1340..2fdc3bcea74b82d7155617d77100b100d8e56047 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -264,7 +264,7 @@ import javax.annotation.Nullable; // Paper
+@@ -265,7 +265,7 @@ import javax.annotation.Nullable; // Paper
  import javax.annotation.Nonnull; // Paper
  
  public final class CraftServer implements Server {
diff --git a/patches/server/0002-Set-BlockData-without-light-updates.patch b/patches/server/0002-Set-BlockData-without-light-updates.patch
index 10c85032d..e4afa2ed7 100644
--- a/patches/server/0002-Set-BlockData-without-light-updates.patch
+++ b/patches/server/0002-Set-BlockData-without-light-updates.patch
@@ -27,7 +27,7 @@ index 877498729c66de9aa6a27c9148f7494d7895615c..63959d7f15c682c2935f872d50de03fd
              return false;
          } else {
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 147d802d9207e358fdb2d1c7806fc2f634dcfd98..22558f4d5ae2eba71e2392729c2c2d931741483c 100644
+index f39ab10c5b0b8d86b579a5b683491204c51db70b..00c5dc8781bc9d893db8e180eb541108ae01c956 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -514,12 +514,12 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -46,7 +46,7 @@ index 147d802d9207e358fdb2d1c7806fc2f634dcfd98..22558f4d5ae2eba71e2392729c2c2d93
          // CraftBukkit start - tree generation
          if (this.captureTreeGeneration) {
              // Paper start
-@@ -709,7 +709,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -710,7 +710,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
                  Block.dropResources(iblockdata, this, pos, tileentity, breakingEntity, ItemStack.EMPTY);
              }
  
@@ -77,7 +77,7 @@ index 134e5ec79bf2dddd4e31930f8a7cb2c02fa29518..fd72d278a2719911a46b6bc9e7da2dc2
  
      boolean removeBlock(BlockPos pos, boolean move);
 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 9522e646529f3d849471931b4b3c0d133e7fcfc5..2f58b13c70ddc52312512f64b02dbda641788038 100644
+index fdd9c61b7248e92dbcbec91cd6fe4c6310bba237..2f2197236d9ba64b62510df923378b0256629d02 100644
 --- a/src/main/java/net/minecraft/world/level/block/Block.java
 +++ b/src/main/java/net/minecraft/world/level/block/Block.java
 @@ -194,7 +194,7 @@ public class Block extends BlockBehaviour implements ItemLike {
@@ -90,7 +90,7 @@ index 9522e646529f3d849471931b4b3c0d133e7fcfc5..2f58b13c70ddc52312512f64b02dbda6
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
-index 23d77e6cc55c06d9c2cfb21421cd19c487dbe765..f878db4a2e9c9b28065420543f639e123f29a72c 100644
+index e2a3510cb2208f9cd4fc92d022ff5055a4cced45..b0dc1e87e034f428bcce67e563db79a8d803fd04 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
 @@ -286,7 +286,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
diff --git a/patches/server/0003-Add-BlockDestroyedByNeighborEvent.patch b/patches/server/0003-Add-BlockDestroyedByNeighborEvent.patch
index e975f4fcc..d480de32e 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 34ecfb89372f459117db99d57a7edd6f681bbe8a..35d83c8ebfbf968943d103b520e0f3a83ed0ebe9 100644
+index 9a17193c9fe26c9c0390906b4c1f9d619ccba249..df2a4449bdc00eb936bf219807d401fc99663926 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,19 +25,19 @@ index 34ecfb89372f459117db99d57a7edd6f681bbe8a..35d83c8ebfbf968943d103b520e0f3a8
                      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 ae9b821d71d2868ba4eb3c73558fdcd6caf264e3..14c04a8b9b772dc4167261edfb736407b0b867a9 100644
+index 879cc823d56625867eb73bb621db6a13f40ad81c..2b3b1c5ccdf58ee9b46d404cfa3790d0fdc2df3d 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 {
-                 }
-             }
-             Item item = this.getItem();
+@@ -352,6 +352,7 @@ public final class ItemStack {
+             CompoundTag oldData = this.getTagClone();
+             int oldCount = this.getCount();
+             ServerLevel world = (ServerLevel) context.getLevel();
 +            if (entityhuman != null) world.pendingPlayerBlockEvents.put(blockposition, new Level.PendingBlockEvent(blockposition, entityhuman)); // Paper
-             InteractionResult enuminteractionresult = item.useOn(context);
-             CompoundTag newData = this.getTagClone();
-             int newCount = this.getCount();
+ 
+             if (!(item instanceof BucketItem/* || item instanceof SolidBucketItem*/)) { // if not bucket // Paper - capture block states for snow buckets
+                 world.captureBlockStates = true;
 diff --git a/src/main/java/net/minecraft/world/level/Level.java b/src/main/java/net/minecraft/world/level/Level.java
-index 22558f4d5ae2eba71e2392729c2c2d931741483c..a601d5b40d3556c688832fd5f392003c2aac5cef 100644
+index 00c5dc8781bc9d893db8e180eb541108ae01c956..46cfd6deda1bb4c98987e79c27633c327d3b0227 100644
 --- a/src/main/java/net/minecraft/world/level/Level.java
 +++ b/src/main/java/net/minecraft/world/level/Level.java
 @@ -184,6 +184,27 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
@@ -68,7 +68,7 @@ index 22558f4d5ae2eba71e2392729c2c2d931741483c..a601d5b40d3556c688832fd5f392003c
      // Paper start - fix and optimise world upgrading
      // copied from below
      public static ResourceKey<DimensionType> getDimensionKey(DimensionType manager) {
-@@ -663,6 +684,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -664,6 +685,7 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
              if (!this.preventPoiUpdated) {
                  this.onBlockStateChange(blockposition, iblockdata1, iblockdata2);
              }
@@ -76,7 +76,7 @@ index 22558f4d5ae2eba71e2392729c2c2d931741483c..a601d5b40d3556c688832fd5f392003c
              // CraftBukkit end
          }
      }
-@@ -684,6 +706,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
+@@ -685,6 +707,17 @@ public abstract class Level implements LevelAccessor, AutoCloseable {
          if (iblockdata.isAir()) {
              return false;
          } else {
@@ -95,7 +95,7 @@ index 22558f4d5ae2eba71e2392729c2c2d931741483c..a601d5b40d3556c688832fd5f392003c
              // Paper start - while the above setAir method is named same and looks very similar
              // they are NOT used with same intent and the above should not fire this event. The above method is more of a BlockSetToAirEvent,
 diff --git a/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java b/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java
-index 9db66b393e057d93a8025b803ae0ad2a1bca61f6..4c7cd93daa2d4fcbf444fe7fceca9e779f883603 100644
+index 030b38d5d5d2578d6ef482a239ef58787efa3b08..329053cf5c342747985f9079e87edc6f883bfa1e 100644
 --- a/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/DoublePlantBlock.java
 @@ -105,6 +105,15 @@ public class DoublePlantBlock extends BushBlock {
diff --git a/patches/server/0007-Add-PlayerData-Events.patch b/patches/server/0007-Add-PlayerData-Events.patch
index 117598c10..d0d0e8e57 100644
--- a/patches/server/0007-Add-PlayerData-Events.patch
+++ b/patches/server/0007-Add-PlayerData-Events.patch
@@ -5,10 +5,10 @@ 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 35d83c8ebfbf968943d103b520e0f3a83ed0ebe9..3364749824b35ecc81f17595627793b486f1e05b 100644
+index df2a4449bdc00eb936bf219807d401fc99663926..939d29db3c535c45866fe67cabbe9304601230b0 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 {
+@@ -602,6 +602,8 @@ public class ServerPlayerGameMode {
                      enuminteractionresult1 = stack.useOn(itemactioncontext);
                  }
  
diff --git a/patches/server/0008-Add-PlayerGetRespawnLocationEvent.patch b/patches/server/0008-Add-PlayerGetRespawnLocationEvent.patch
index 921741325..dfe954af7 100644
--- a/patches/server/0008-Add-PlayerGetRespawnLocationEvent.patch
+++ b/patches/server/0008-Add-PlayerGetRespawnLocationEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add PlayerGetRespawnLocationEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index fff7ad7a45f310783ac96b44575ad3db13d537fa..04d8f26e760e893ed9b30f6fc56e6753871d1d47 100644
+index f097ec5b4e3ad6b1a7c464a8cff4f8b2568fcf4f..20a0b9835c47ca153a6f77dacf4b775de32e4ef2 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -845,49 +845,57 @@ public abstract class PlayerList {
+@@ -853,49 +853,57 @@ public abstract class PlayerList {
  
          // CraftBukkit start - fire PlayerRespawnEvent
          if (location == null) {
diff --git a/patches/server/0009-Set-multiple-team-settings-at-once.patch b/patches/server/0009-Set-multiple-team-settings-at-once.patch
index 18aac7c20..26591b623 100644
--- a/patches/server/0009-Set-multiple-team-settings-at-once.patch
+++ b/patches/server/0009-Set-multiple-team-settings-at-once.patch
@@ -106,10 +106,10 @@ index 9464054912e19fc78dd965b71fce20a18564b351..1624a0f8ea211a4c43fd01612674ca50
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-index 7098b77fe4275e39694ed7d8fb031b9397302b9f..910f6ae45f595a1ba036634467348ff7a7449449 100644
+index 9c3520524cfb903da6a5401760394ec1b49a1825..a6809c3104d4a8fce89eb5056b445ae0517bf9a0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftTeam.java
-@@ -346,6 +346,37 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
+@@ -341,6 +341,37 @@ final class CraftTeam extends CraftScoreboardComponent implements Team {
          }
      }
  
diff --git a/patches/server/0010-Smooth-Teleports.patch b/patches/server/0010-Smooth-Teleports.patch
index a44e03be8..e772ffd77 100644
--- a/patches/server/0010-Smooth-Teleports.patch
+++ b/patches/server/0010-Smooth-Teleports.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Smooth Teleports
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 9d46536f80b5b3e6641fd377c02166a431edfd77..d138cceffd95eda11d4f4179dffd7ddbcd22e26f 100644
+index 161c40692e8d469fad4169908b9353be0f85d0d8..2b93a37ee1f711c14140eb96f29dfdd3290641ad 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -277,6 +277,7 @@ public class ServerPlayer extends Player {
+@@ -278,6 +278,7 @@ public class ServerPlayer extends Player {
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
      public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
      public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
@@ -17,10 +17,10 @@ index 9d46536f80b5b3e6641fd377c02166a431edfd77..d138cceffd95eda11d4f4179dffd7ddb
      private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
      public io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 04d8f26e760e893ed9b30f6fc56e6753871d1d47..f42bcc36b6aae2560cebb9ceeab69577097fff14 100644
+index 20a0b9835c47ca153a6f77dacf4b775de32e4ef2..97c6f1c622af02b3761b23a4d3a67b385e45ea84 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -927,12 +927,12 @@ public abstract class PlayerList {
+@@ -935,12 +935,12 @@ public abstract class PlayerList {
          int i = flag ? 1 : 0;
          // CraftBukkit start
          LevelData worlddata = worldserver1.getLevelData();
@@ -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 5b201d2c21f04e0223970035e0631f8f92ea0d3a..a39ca2dc5c57fecc5df2b6dd8918f6943af04487 100644
+index 472705e92cef5802f377637d8ea5c8001d7a185c..91dba3b1b7e92063f2d57aac50d68ab832466e05 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1245,6 +1245,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1247,6 +1247,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          // Paper end
      }
  
diff --git a/patches/server/0013-AntiXray-Bypass.patch b/patches/server/0013-AntiXray-Bypass.patch
index f45a5c846..131a42d50 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 a39ca2dc5c57fecc5df2b6dd8918f6943af04487..e77beae68b89f4cc66eb5564933dea3c363e93e2 100644
+index 91dba3b1b7e92063f2d57aac50d68ab832466e05..4b346910a3274441d835cedd44b0a853420ea680 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -194,6 +194,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -196,6 +196,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 a39ca2dc5c57fecc5df2b6dd8918f6943af04487..e77beae68b89f4cc66eb5564933dea3c
  
      public CraftPlayer(CraftServer server, ServerPlayer entity) {
          super(server, entity);
-@@ -2740,6 +2741,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2820,6 +2821,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
      // Paper end
  
diff --git a/patches/server/0016-Don-t-send-fire-packets-if-player-has-FR.patch b/patches/server/0016-Don-t-send-fire-packets-if-player-has-FR.patch
index 60f556622..aee253972 100644
--- a/patches/server/0016-Don-t-send-fire-packets-if-player-has-FR.patch
+++ b/patches/server/0016-Don-t-send-fire-packets-if-player-has-FR.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Don't send fire packets if player has FR
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 513c34aa02d63f7e3c178eade818e156af4541db..831238b2d7e1cc8dc86b0471e3c0cbc4569e2757 100644
+index 0ed297f189e5d21c497ac78294db6ca664c0f2c4..61ee883c7dd71ee4ec702ca266ff9fc66184ba49 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -867,7 +867,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -866,7 +866,11 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
  
          this.checkBelowWorld();
          if (!this.level().isClientSide) {
diff --git a/patches/server/0017-Allow-access-to-LightEngine.patch b/patches/server/0017-Allow-access-to-LightEngine.patch
index c0c220d09..ec34be1e8 100644
--- a/patches/server/0017-Allow-access-to-LightEngine.patch
+++ b/patches/server/0017-Allow-access-to-LightEngine.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow access to LightEngine
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 9209b598d7168b82574e4800056b8b9f84265dd0..4321789e9222350266ea0830473861e2f5fd75ad 100644
+index 65d947df910d60f478e7a449eb161e5105e2c0c9..e08b72010f22ce680e88f443782bdfe6a46285f9 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -505,7 +505,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -524,7 +524,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
          return !ChunkMap.isChunkInRange(x1, z1, x2, z2, distance) ? false : !ChunkMap.isChunkInRange(x1 + 1, z1 + 1, x2, z2, distance) || !ChunkMap.isChunkInRange(x1 - 1, z1 + 1, x2, z2, distance) || !ChunkMap.isChunkInRange(x1 + 1, z1 - 1, x2, z2, distance) || !ChunkMap.isChunkInRange(x1 - 1, z1 - 1, x2, z2, distance);
      }
  
diff --git a/patches/server/0020-PlayerLoadStatsEvent.patch b/patches/server/0020-PlayerLoadStatsEvent.patch
index 7325af74f..61a04676d 100644
--- a/patches/server/0020-PlayerLoadStatsEvent.patch
+++ b/patches/server/0020-PlayerLoadStatsEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] PlayerLoadStatsEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index f42bcc36b6aae2560cebb9ceeab69577097fff14..5518fe1df4af78623cb1d060c5336f59bc4ce7d5 100644
+index 97c6f1c622af02b3761b23a4d3a67b385e45ea84..7f059a71d25170e8e3215c7d91ab7927394cfeb5 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
-@@ -1466,7 +1466,7 @@ public abstract class PlayerList {
+@@ -1474,7 +1474,7 @@ public abstract class PlayerList {
                  }
              }
  
diff --git a/patches/server/0026-Add-jackson.patch b/patches/server/0025-Add-jackson.patch
similarity index 89%
rename from patches/server/0026-Add-jackson.patch
rename to patches/server/0025-Add-jackson.patch
index 7204f1787..042d7084a 100644
--- a/patches/server/0026-Add-jackson.patch
+++ b/patches/server/0025-Add-jackson.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add jackson
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 25ec51f3d299414cd122b3f125a67a86df7a3d73..4ae0234060c33952760c298bff343370aba3ab1a 100644
+index 2e1cea360bb6ff85eb8da54237bc407653eb91f6..475cbb6120655419fc7dc51292e6beedfe778656 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -19,6 +19,13 @@ dependencies {
diff --git a/patches/server/0027-Maybe-can-t-tostring.patch b/patches/server/0026-Maybe-can-t-tostring.patch
similarity index 93%
rename from patches/server/0027-Maybe-can-t-tostring.patch
rename to patches/server/0026-Maybe-can-t-tostring.patch
index b53df4101..415007e85 100644
--- a/patches/server/0027-Maybe-can-t-tostring.patch
+++ b/patches/server/0026-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 14c04a8b9b772dc4167261edfb736407b0b867a9..461260d6e42b924dca7d62766c01ca3782b1557f 100644
+index 2b3b1c5ccdf58ee9b46d404cfa3790d0fdc2df3d..b31f21e2d9faa00174bbcbbd1e0cf1b22c8b69d4 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -732,7 +732,11 @@ public final class ItemStack {
+@@ -736,7 +736,11 @@ public final class ItemStack {
  
              itemstack.setPopTime(this.getPopTime());
              if (this.tag != null) {
diff --git a/patches/server/0028-Allow-inventory-clicks-in-Spectator.patch b/patches/server/0027-Allow-inventory-clicks-in-Spectator.patch
similarity index 88%
rename from patches/server/0028-Allow-inventory-clicks-in-Spectator.patch
rename to patches/server/0027-Allow-inventory-clicks-in-Spectator.patch
index c0b351c79..bf221f044 100644
--- a/patches/server/0028-Allow-inventory-clicks-in-Spectator.patch
+++ b/patches/server/0027-Allow-inventory-clicks-in-Spectator.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Allow inventory clicks in Spectator
 
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 2a609e43370e68943c580083f7f7d8c9b0972955..4ee0bedf8ca9014f69d450357555d947219dea78 100644
+index e8923befdee3514be5346c6e6c8e7236e7e6e668..dac4b3e67b474554655f9c898ac4bce7a3abfdad 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2970,7 +2970,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
+@@ -3023,7 +3023,7 @@ public class ServerGamePacketListenerImpl implements ServerPlayerConnection, Tic
          if (this.player.isImmobile()) return; // CraftBukkit
          this.player.resetLastActionTime();
          if (this.player.containerMenu.containerId == packet.getContainerId() && this.player.containerMenu.stillValid(this.player)) { // CraftBukkit
diff --git a/patches/server/0029-Packet-obfuscation-and-reduction.patch b/patches/server/0028-Packet-obfuscation-and-reduction.patch
similarity index 94%
rename from patches/server/0029-Packet-obfuscation-and-reduction.patch
rename to patches/server/0028-Packet-obfuscation-and-reduction.patch
index 59105bf71..edc1d47d1 100644
--- a/patches/server/0029-Packet-obfuscation-and-reduction.patch
+++ b/patches/server/0028-Packet-obfuscation-and-reduction.patch
@@ -118,10 +118,10 @@ index 5dfb35117c285e0b202dc9c088ad5848beb8d054..b3d2cbf9f60c4a4b34df20bfe45a80ac
  
      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 81d0b2933040a451441f660f9e46199ae3b111e3..516fcc67aa83a870b74372742b81d0acef242655 100644
+index 196280f54e397c69d32bd4d1f6ae666efdd93773..a514a1f26e439b5959093488ec9905fec327a404 100644
 --- a/src/main/java/net/minecraft/server/level/ServerEntity.java
 +++ b/src/main/java/net/minecraft/server/level/ServerEntity.java
-@@ -375,7 +375,20 @@ public class ServerEntity {
+@@ -381,7 +381,20 @@ public class ServerEntity {
  
          if (list != null) {
              this.trackedDataValues = datawatcher.getNonDefaultValues();
@@ -144,10 +144,10 @@ index 81d0b2933040a451441f660f9e46199ae3b111e3..516fcc67aa83a870b74372742b81d0ac
  
          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 819ed80a563b84c5ced68623090ee5dbf7b12749..3562a973aa65862d9525efd74e256eec2f8bf2fd 100644
+index d90e88fa23489d54c7ad4d14f9ba41afde78ab06..2bdc547fc332b77ee9133a01c0dc678d6068c454 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3271,7 +3271,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3270,7 +3270,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              this.entityData.markDirty(Entity.DATA_AIR_SUPPLY_ID);
              return;
          }
@@ -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 e77beae68b89f4cc66eb5564933dea3c363e93e2..3ccd9d56373ffcab73b8356d7a3542615b2d44ed 100644
+index 4b346910a3274441d835cedd44b0a853420ea680..7dd57ce35c889f2fbc2faeab581f01d37e1cb6c6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -2506,7 +2506,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -2586,7 +2586,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
                  this.sendHealthUpdate();
              }
          }
diff --git a/patches/server/0030-Long-distance-tracking.patch b/patches/server/0029-Long-distance-tracking.patch
similarity index 91%
rename from patches/server/0030-Long-distance-tracking.patch
rename to patches/server/0029-Long-distance-tracking.patch
index 498303dd4..f98c03e7b 100644
--- a/patches/server/0030-Long-distance-tracking.patch
+++ b/patches/server/0029-Long-distance-tracking.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Long distance tracking
 
 
 diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/java/net/minecraft/server/level/ChunkMap.java
-index 4321789e9222350266ea0830473861e2f5fd75ad..6245bbc5745787b835b9b3a89da088ee01d4d706 100644
+index e08b72010f22ce680e88f443782bdfe6a46285f9..3809b2125254424d4939794961a9f08254af54c8 100644
 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java
-@@ -1532,6 +1532,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
+@@ -1551,6 +1551,7 @@ public class ChunkMap extends ChunkStorage implements ChunkHolder.PlayerProvider
                  // Paper end - remove allocation of Vec3D here
                  Vec3 vec3d = player.position().subtract(this.entity.position());
                  double d0 = (double) Math.min(this.getEffectiveRange(), io.papermc.paper.chunk.system.ChunkSystem.getSendViewDistance(player) * 16); // Paper - per player view distance
@@ -17,10 +17,10 @@ index 4321789e9222350266ea0830473861e2f5fd75ad..6245bbc5745787b835b9b3a89da088ee
                  double d2 = d0 * d0;
                  boolean flag = d1 <= d2 && this.entity.broadcastToPlayer(player);
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 4aa043cc25d7d770ead47bcc3bf0373336768e5c..20aea9a41bcb21b8063ae3a227d8d385b7fe9665 100644
+index 2b93a37ee1f711c14140eb96f29dfdd3290641ad..f301178c2d68400c73a50c298a6bb6fd0f40e8ad 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -278,6 +278,7 @@ public class ServerPlayer extends Player {
+@@ -279,6 +279,7 @@ public class ServerPlayer extends Player {
      public PlayerNaturallySpawnCreaturesEvent playerNaturallySpawnedEvent; // Paper
      public org.bukkit.event.player.PlayerQuitEvent.QuitReason quitReason = null; // Paper - there are a lot of changes to do if we change all methods leading to the event
      public boolean smoothWorldTeleport; // Slice
@@ -28,7 +28,7 @@ index 4aa043cc25d7d770ead47bcc3bf0373336768e5c..20aea9a41bcb21b8063ae3a227d8d385
  
      private final java.util.concurrent.atomic.AtomicReference<io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances> viewDistances = new java.util.concurrent.atomic.AtomicReference<>(new io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.ViewDistances(-1, -1, -1));
      public io.papermc.paper.chunk.system.RegionizedPlayerChunkLoader.PlayerChunkLoaderData chunkLoader;
-@@ -2650,4 +2651,18 @@ public class ServerPlayer extends Player {
+@@ -2651,4 +2652,18 @@ public class ServerPlayer extends Player {
          return (CraftPlayer) super.getBukkitEntity();
      }
      // CraftBukkit end
@@ -48,7 +48,7 @@ index 4aa043cc25d7d770ead47bcc3bf0373336768e5c..20aea9a41bcb21b8063ae3a227d8d385
 +    // Slice end
  }
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 5638290c72e0daeddfa79fd55e87334fa7d86f72..9f1daa3f9e8e04430a2329e9cbfa9f94ffc72c02 100644
+index 5b5109e942b18418b3a3a0e2109fe4ef15045fe5..507519c75fabe8991cddbc1aa7813cec25dee01b 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -271,6 +271,7 @@ public class SpigotWorldConfig
diff --git a/patches/server/0031-Shared-Data-Storage.patch b/patches/server/0030-Shared-Data-Storage.patch
similarity index 95%
rename from patches/server/0031-Shared-Data-Storage.patch
rename to patches/server/0030-Shared-Data-Storage.patch
index 565d52f4b..2509c3aca 100644
--- a/patches/server/0031-Shared-Data-Storage.patch
+++ b/patches/server/0030-Shared-Data-Storage.patch
@@ -5,11 +5,11 @@ 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 4ac3fa45cd155ae8a852e26d4d4d1f16b28efdc2..b89e3568cc9371984fe1cd8f83008a9250956465 100644
+index 019d3bbd78fb0b06861979d223915fedb6c99442..89ec08d2550084c1456ce885c71d1e5d121df19d 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 {
-         public boolean lagCompensateBlockBreaking = true;
+@@ -316,6 +316,7 @@ public class GlobalConfiguration extends ConfigurationPart {
+         public boolean useAlternativeLuckFormula = false;
          public boolean useDimensionTypeForCustomSpawners = false;
          public boolean strictAdvancementDimensionCheck = false;
 +        public String sharedDataFolder = "";
@@ -17,7 +17,7 @@ index 4ac3fa45cd155ae8a852e26d4d4d1f16b28efdc2..b89e3568cc9371984fe1cd8f83008a92
  
      public BlockUpdates blockUpdates;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 681123682c1a0060d05860835e5b9f46147f7c1f..619956817b5fccb74a6d68d5e3ea1b317c69b779 100644
+index ac1cb065ace9198e7e8fe65b3225d0caf456b9dc..0d92e021d83a6f467131b079660624be7cd8c137 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/0031-Equipment-Packet-Caching.patch
similarity index 97%
rename from patches/server/0032-Equipment-Packet-Caching.patch
rename to patches/server/0031-Equipment-Packet-Caching.patch
index 3a98222cd..ee8a44f74 100644
--- a/patches/server/0032-Equipment-Packet-Caching.patch
+++ b/patches/server/0031-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 516fcc67aa83a870b74372742b81d0acef242655..07febce429ebd15656e8483d2d2af9e93c13de19 100644
+index a514a1f26e439b5959093488ec9905fec327a404..0ac580f3cf8f95025992420702d67ad56db2ba05 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,7 +57,7 @@ index 516fcc67aa83a870b74372742b81d0acef242655..07febce429ebd15656e8483d2d2af9e9
 +            livingEntity.sendEquipment(sender, player); // Slice
          }
  
-         if (!this.entity.getPassengers().isEmpty()) {
+         // CraftBukkit start - MC-109346: Fix for nonsensical head yaw
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 index b7c9876eaff4365d136a9af20c1a5845b3094336..a5165d76d8495242708093f7e4449f6f67386ad7 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -182,10 +182,10 @@ index b7c9876eaff4365d136a9af20c1a5845b3094336..a5165d76d8495242708093f7e4449f6f
 +    // 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 6095d43e08bc1ffc4e9a4796fc7adbd07d69d716..8c29e292b8e495ca64668c6a22b9765ffe836a08 100644
+index f0ce29d21fe9af803ce4e41b8c037b2ec5d1b124..30eebb880d53132d03af656e4662de5566415358 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -1099,4 +1099,14 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -1094,4 +1094,14 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          getHandle().knockback(strength, directionX, directionZ);
      };
      // Paper end
diff --git a/patches/server/0033-Add-canDespawn-to-Warden.patch b/patches/server/0032-Add-canDespawn-to-Warden.patch
similarity index 95%
rename from patches/server/0033-Add-canDespawn-to-Warden.patch
rename to patches/server/0032-Add-canDespawn-to-Warden.patch
index 3f11a7c30..9add93cb9 100644
--- a/patches/server/0033-Add-canDespawn-to-Warden.patch
+++ b/patches/server/0032-Add-canDespawn-to-Warden.patch
@@ -49,10 +49,10 @@ index 03f16a5541de6bc95407aaa24741570c1993dc9e..07600fdd32a058d0e3f9828efdc18f5e
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java
-index 6ecdc4bf1f6b8f0363e667135ba463433be5c0fb..6107439289f9932e6d68dbfa0c35ac58e4a61007 100644
+index 46e3cc146a4b109c4baaf94f42d825646abade68..b248150c047890f45fae75716e40e495752f3732 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWarden.java
-@@ -92,4 +92,11 @@ public class CraftWarden extends CraftMonster implements org.bukkit.entity.Warde
+@@ -86,4 +86,11 @@ public class CraftWarden extends CraftMonster implements org.bukkit.entity.Warde
              case ANGRY -> AngerLevel.ANGRY;
          };
      }
diff --git a/patches/server/0034-Save-DimensionDataStorage-async.patch b/patches/server/0033-Save-DimensionDataStorage-async.patch
similarity index 100%
rename from patches/server/0034-Save-DimensionDataStorage-async.patch
rename to patches/server/0033-Save-DimensionDataStorage-async.patch