diff --git a/gradle.properties b/gradle.properties
index 75fd717f..90422603 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,5 +4,5 @@ version=1.20.2-R0.1-SNAPSHOT
 mcVersion=1.20.2
 packageVersion=1_20_R2
 org.gradle.jvmargs=-Xmx2G
-paperRef=2182d4779289ee7dbb0e7510b0494716ec7e2cf4
+paperRef=931781c220b98dde0159c9a3c8dce06c3b2b1e13
 preVersion=false
diff --git a/patches/api/0009-Force-peaceful-mode-switch.patch b/patches/api/0009-Force-peaceful-mode-switch.patch
index 6661e1ee..12451c6d 100644
--- a/patches/api/0009-Force-peaceful-mode-switch.patch
+++ b/patches/api/0009-Force-peaceful-mode-switch.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Force peaceful mode switch
 
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index f72f0f0f8eee95f95adc969d55ba7de82ee30e2a..aea2d7f973db8a061a37225937eb475ab7ba672b 100644
+index 567a36a4887da8994c9170e2885aa8cc357efa0c..420ff2b7edd6c9596b661bece882a26a42373a77 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -4219,6 +4219,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
+@@ -4243,6 +4243,12 @@ public interface World extends RegionAccessor, WorldInfo, PluginMessageRecipient
      @NotNull
      public Set<FeatureFlag> getFeatureFlags();
  
diff --git a/patches/server/0003-Leaves-Server-Utils.patch b/patches/server/0003-Leaves-Server-Utils.patch
index 6a496bfa..d6a49e72 100644
--- a/patches/server/0003-Leaves-Server-Utils.patch
+++ b/patches/server/0003-Leaves-Server-Utils.patch
@@ -31,7 +31,7 @@ index 46954db7ecd35ac4018fdf476df7c8020d7ce6c8..044c51ebb058fc36074fd178929e3279
      public PlayerAreaMap() {
          super();
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 1e05fca2a2ba6e2c0b641b6e27585520889cd8a6..e54666bde53dcd0fdcd1a0dfd3e047886011508f 100644
+index fece91254b10b59474056aa730fd420f90cd7bec..2f18ce5769a39aeecaf36b6f7419aee9fac3bc32 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -417,6 +417,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -62,7 +62,7 @@ index 1e05fca2a2ba6e2c0b641b6e27585520889cd8a6..e54666bde53dcd0fdcd1a0dfd3e04788
  
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.forThrowable(throwable, "Loading entity NBT");
-@@ -4848,4 +4855,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4874,4 +4881,10 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
          return ((net.minecraft.server.level.ServerChunkCache) level.getChunkSource()).isPositionTicking(this);
      }
      // Paper end
diff --git a/patches/server/0007-Fix-gravity-block-duper.patch b/patches/server/0007-Fix-gravity-block-duper.patch
index 2b8c33b7..97cce451 100644
--- a/patches/server/0007-Fix-gravity-block-duper.patch
+++ b/patches/server/0007-Fix-gravity-block-duper.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix gravity block duper
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e54666bde53dcd0fdcd1a0dfd3e047886011508f..f2572810c52b948d7c83b88afe5f2c6b898888da 100644
+index 2f18ce5769a39aeecaf36b6f7419aee9fac3bc32..d4e22baadc9e58ccc0b59ae36b2266730bb0ead8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -500,38 +500,9 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -48,7 +48,7 @@ index e54666bde53dcd0fdcd1a0dfd3e047886011508f..f2572810c52b948d7c83b88afe5f2c6b
  
      public boolean isLegacyTrackingEntity = false;
  
-@@ -3128,7 +3099,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -3154,7 +3125,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              }
  
              this.processPortalCooldown();
diff --git a/patches/server/0010-Fakeplayer-support.patch b/patches/server/0010-Fakeplayer-support.patch
index a432684f..c3b2040d 100644
--- a/patches/server/0010-Fakeplayer-support.patch
+++ b/patches/server/0010-Fakeplayer-support.patch
@@ -99,7 +99,7 @@ index d9a33968fa0f1aa5def297f34ba1dbf229ee7c32..a54e9a6a35760eae2c70eb6b9d4881ec
  
              }
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 08980763020a13ab49dc7d637625a4fba56da8c9..86666a788a1a91a2f90ed3161c0844c5b09a97d6 100644
+index 907c8f15f5247f9972c6677ff0f9e1aa22764a04..cbf1acaae2707c42f0574ff1766957c32da4d90a 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -95,7 +95,6 @@ import net.minecraft.util.Mth;
@@ -156,15 +156,15 @@ index 08980763020a13ab49dc7d637625a4fba56da8c9..86666a788a1a91a2f90ed3161c0844c5
              CriteriaTriggers.LEVITATION.trigger(this, this.levitationStartPos, this.tickCount - this.levitationStartTime);
          }
 @@ -940,7 +944,7 @@ public class ServerPlayer extends Player {
-         java.util.List<org.bukkit.inventory.ItemStack> loot = new java.util.ArrayList<org.bukkit.inventory.ItemStack>(this.getInventory().getContainerSize());
+         List<DefaultDrop> loot = new java.util.ArrayList<>(this.getInventory().getContainerSize()); // Paper
          boolean keepInventory = this.level().getGameRules().getBoolean(GameRules.RULE_KEEPINVENTORY) || this.isSpectator();
  
 -        if (!keepInventory) {
 +        if (!keepInventory || this instanceof ServerBot) { // Leaves - skip bot
              for (ItemStack item : this.getInventory().getContents()) {
                  if (!item.isEmpty() && !EnchantmentHelper.hasVanishingCurse(item)) {
-                     loot.add(CraftItemStack.asCraftMirror(item));
-@@ -1269,6 +1273,13 @@ public class ServerPlayer extends Player {
+                     loot.add(new DefaultDrop(item, stack -> this.drop(stack, true, false))); // Paper - drop function taken from Inventory#dropAll
+@@ -1267,6 +1271,13 @@ public class ServerPlayer extends Player {
                  this.lastSentHealth = -1.0F;
                  this.lastSentFood = -1;
  
@@ -297,7 +297,7 @@ index afbe41b671073232614a1de246bea30ea2a26929..dea28bf8e1c0f67f13cc51d9e2cc6da6
 +    // Leaves end - fakeplayer support
  }
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 34a34cee0402c03a1ffb35cfc8c422594054c88a..85d50d082dfb55dcca2be4a7764175784b013ee9 100644
+index d4e22baadc9e58ccc0b59ae36b2266730bb0ead8..ab1117bbc095e5935bba5e23c6232e7ec122cd1e 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -1416,7 +1416,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
diff --git a/patches/server/0039-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0039-Reduce-entity-fluid-lookups-if-no-fluids.patch
index 836996bf..4d312e0a 100644
--- a/patches/server/0039-Reduce-entity-fluid-lookups-if-no-fluids.patch
+++ b/patches/server/0039-Reduce-entity-fluid-lookups-if-no-fluids.patch
@@ -6,10 +6,10 @@ 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 60672f00b8355815de47f58753a4a184288fc728..759ee77818ea2916ea8c217be8ed26338f662861 100644
+index 0231259e691d342ad8cb1306e9d35b4296a6148f..c201b92d04a48b8330182db6b0d9a0fdff4c7f92 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4316,16 +4316,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4342,16 +4342,18 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -35,7 +35,7 @@ index 60672f00b8355815de47f58753a4a184288fc728..759ee77818ea2916ea8c217be8ed2633
              double d1 = 0.0D;
              boolean flag = this.isPushedByFluid();
              boolean flag1 = false;
-@@ -4333,38 +4335,123 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4359,38 +4361,123 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
              int k1 = 0;
              BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
  
diff --git a/patches/server/0046-Alternative-block-placement-Protocol.patch b/patches/server/0046-Alternative-block-placement-Protocol.patch
index 3ec33bb7..cd01d56c 100644
--- a/patches/server/0046-Alternative-block-placement-Protocol.patch
+++ b/patches/server/0046-Alternative-block-placement-Protocol.patch
@@ -9,10 +9,10 @@ MasaGadget(https://github.com/plusls/MasaGadget)
 litematica(https://github.com/maruohon/litematica)
 
 diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
-index e483186a5292b3b53bfb1af4d56f55fcc1a6106c..39a8fb7a73362beab1e4a53b6297a054a159bb80 100644
+index efdf56044396b4ce486948d2c993971f99174a5e..f7e5f3e43714ac74d99f13e59868f43bf791f96d 100644
 --- a/src/main/java/net/minecraft/world/item/BlockItem.java
 +++ b/src/main/java/net/minecraft/world/item/BlockItem.java
-@@ -158,7 +158,7 @@ public class BlockItem extends Item {
+@@ -157,7 +157,7 @@ public class BlockItem extends Item {
  
      @Nullable
      protected BlockState getPlacementState(BlockPlaceContext context) {
diff --git a/patches/server/0047-Player-operation-limiter.patch b/patches/server/0047-Player-operation-limiter.patch
index a3c2190d..fb5e0758 100644
--- a/patches/server/0047-Player-operation-limiter.patch
+++ b/patches/server/0047-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 8bd801e15408bf5284acec33bdf3c798c7cf54f6..97332f315bf0a4bca0d6526f8953bf34757b6321 100644
+index cbf1acaae2707c42f0574ff1766957c32da4d90a..3aaf711182ad26e33c26b29ef1b51b9050233b3d 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -274,6 +274,10 @@ public class ServerPlayer extends Player {
@@ -28,7 +28,7 @@ index 8bd801e15408bf5284acec33bdf3c798c7cf54f6..97332f315bf0a4bca0d6526f8953bf34
          this.gameMode.tick();
          this.wardenSpawnTracker.tick();
          --this.spawnInvulnerableTime;
-@@ -2666,5 +2671,32 @@ public class ServerPlayer extends Player {
+@@ -2664,5 +2669,32 @@ public class ServerPlayer extends Player {
      public CraftPlayer getBukkitEntity() {
          return (CraftPlayer) super.getBukkitEntity();
      }
@@ -62,7 +62,7 @@ index 8bd801e15408bf5284acec33bdf3c798c7cf54f6..97332f315bf0a4bca0d6526f8953bf34
      // 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 106a312aba249d1e83e4b535fc6e741e04ccfd14..b065f2de65d5389bc4d202d8c0b1aecb565340a6 100644
+index 3706e94108f68a16fea63e734f3e3b6871dcb0b8..58586b97d3bdb6f5e40fc9c487ba82d57c17a20c 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;
@@ -73,7 +73,7 @@ index 106a312aba249d1e83e4b535fc6e741e04ccfd14..b065f2de65d5389bc4d202d8c0b1aecb
  // CraftBukkit end
  
  public class ServerPlayerGameMode {
-@@ -334,6 +335,19 @@ public class ServerPlayerGameMode {
+@@ -331,6 +332,19 @@ public class ServerPlayerGameMode {
      }
  
      public void destroyAndAck(BlockPos pos, int sequence, String reason) {
@@ -94,7 +94,7 @@ index 106a312aba249d1e83e4b535fc6e741e04ccfd14..b065f2de65d5389bc4d202d8c0b1aecb
              this.debugLogging(pos, true, sequence, reason);
          } else {
 diff --git a/src/main/java/net/minecraft/world/item/BlockItem.java b/src/main/java/net/minecraft/world/item/BlockItem.java
-index 39a8fb7a73362beab1e4a53b6297a054a159bb80..e38967daceee9a510f0021ef43f6324478088603 100644
+index f7e5f3e43714ac74d99f13e59868f43bf791f96d..ef484b74c8e3eedba18978534b70b396810880f8 100644
 --- a/src/main/java/net/minecraft/world/item/BlockItem.java
 +++ b/src/main/java/net/minecraft/world/item/BlockItem.java
 @@ -32,9 +32,12 @@ import net.minecraft.world.level.block.state.StateDefinition;
diff --git a/patches/server/0052-Return-nether-portal-fix.patch b/patches/server/0052-Return-nether-portal-fix.patch
index 08725a42..003c8740 100644
--- a/patches/server/0052-Return-nether-portal-fix.patch
+++ b/patches/server/0052-Return-nether-portal-fix.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Return nether portal fix
 This patch is powered by NetherPortalFix(https://github.com/TwelveIterationMods/NetherPortalFix)
 
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index 97332f315bf0a4bca0d6526f8953bf34757b6321..fe5ef64df18c38cfb7912c7415ece9cc94cbc222 100644
+index 3aaf711182ad26e33c26b29ef1b51b9050233b3d..0b6cd28cbaa65a391dfe190f8934befcff696ed5 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
 @@ -180,6 +180,7 @@ import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
@@ -17,7 +17,7 @@ index 97332f315bf0a4bca0d6526f8953bf34757b6321..fe5ef64df18c38cfb7912c7415ece9cc
  // CraftBukkit end
  
  public class ServerPlayer extends Player {
-@@ -1289,6 +1290,24 @@ public class ServerPlayer extends Player {
+@@ -1287,6 +1288,24 @@ public class ServerPlayer extends Player {
                  PlayerChangedWorldEvent changeEvent = new PlayerChangedWorldEvent(this.getBukkitEntity(), worldserver1.getWorld());
                  this.level().getCraftServer().getPluginManager().callEvent(changeEvent);
                  // CraftBukkit end
@@ -42,7 +42,7 @@ index 97332f315bf0a4bca0d6526f8953bf34757b6321..fe5ef64df18c38cfb7912c7415ece9cc
              }
              // Paper start
              if (this.isBlocking()) {
-@@ -1341,6 +1360,30 @@ public class ServerPlayer extends Player {
+@@ -1339,6 +1358,30 @@ public class ServerPlayer extends Player {
      protected Optional<BlockUtil.FoundRectangle> getExitPortal(ServerLevel worldserver, BlockPos blockposition, boolean flag, WorldBorder worldborder, int searchRadius, boolean canCreatePortal, int createRadius) { // CraftBukkit
          Optional<BlockUtil.FoundRectangle> optional = super.getExitPortal(worldserver, blockposition, flag, worldborder, searchRadius, canCreatePortal, createRadius); // CraftBukkit
  
@@ -121,7 +121,7 @@ index fe9110a92b690c2d3d8da171216129da20462984..70c2ee8b98afdf8006273511f70dbd8a
  
          // Save player file again if they were disconnected
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 2f79822f10055ba9927716bbf5d46df3aa0046ef..f5695c4dd6f5192e8b11b87e22c41c40d4261f46 100644
+index e27b95e71342dc3dc2e7274fb8cf0c41629f3426..eea0eb67b3f74574d8dcd8cad30394f3a49cb2cd 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -241,7 +241,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0062-No-feather-falling-trample.patch b/patches/server/0062-No-feather-falling-trample.patch
index e92ca010..b7088e14 100644
--- a/patches/server/0062-No-feather-falling-trample.patch
+++ b/patches/server/0062-No-feather-falling-trample.patch
@@ -5,10 +5,10 @@ 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 5946f06f63b5694034bd027984a4925b0831d439..c66428ed5e0557b0e2bcc2cfd9bfbe992d85bf72 100644
+index 502dcba14da9d3dcefc61fdc349a4e1e1d94b478..9828ab37ba2ae1e6e1f4b46d021061e0924cf3c7 100644
 --- a/src/main/java/net/minecraft/world/level/block/FarmBlock.java
 +++ b/src/main/java/net/minecraft/world/level/block/FarmBlock.java
-@@ -102,6 +102,13 @@ public class FarmBlock extends Block {
+@@ -104,6 +104,13 @@ public class FarmBlock extends Block {
      public void fallOn(Level world, BlockState state, BlockPos pos, Entity entity, float fallDistance) {
          super.fallOn(world, state, pos, entity, fallDistance); // CraftBukkit - moved here as game rules / events shouldn't affect fall damage.
          if (!world.isClientSide && world.random.nextFloat() < fallDistance - 0.5F && entity instanceof LivingEntity && (entity instanceof Player || world.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)) && entity.getBbWidth() * entity.getBbWidth() * entity.getBbHeight() > 0.512F) {
diff --git a/patches/server/0074-Fix-Paper-9372.patch b/patches/server/0074-Fix-Paper-9372.patch
index 9f7a4f7e..439f0195 100644
--- a/patches/server/0074-Fix-Paper-9372.patch
+++ b/patches/server/0074-Fix-Paper-9372.patch
@@ -6,10 +6,10 @@ 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 fe5ef64df18c38cfb7912c7415ece9cc94cbc222..af8d99c2f7393bcbd10d045b72f6d8c17c0b7929 100644
+index 0b6cd28cbaa65a391dfe190f8934befcff696ed5..21aa07c96ebc7f760ecf8fa62da7dc6738c2cf93 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -1260,6 +1260,7 @@ public class ServerPlayer extends Player {
+@@ -1258,6 +1258,7 @@ public class ServerPlayer extends Player {
                  this.setServerLevel(worldserver);
                  this.connection.teleport(exit); // CraftBukkit - use internal teleport without event
                  this.connection.resetPosition();
@@ -17,7 +17,7 @@ index fe5ef64df18c38cfb7912c7415ece9cc94cbc222..af8d99c2f7393bcbd10d045b72f6d8c1
                  worldserver.addDuringPortalTeleport(this);
                  worldserver1.getProfiler().pop();
                  this.triggerDimensionChangeTriggers(worldserver1);
-@@ -1976,6 +1977,7 @@ public class ServerPlayer extends Player {
+@@ -1974,6 +1975,7 @@ public class ServerPlayer extends Player {
      public void moveTo(double x, double y, double z) {
          super.moveTo(x, y, z);
          this.connection.resetPosition();
@@ -25,7 +25,7 @@ index fe5ef64df18c38cfb7912c7415ece9cc94cbc222..af8d99c2f7393bcbd10d045b72f6d8c1
      }
  
      @Override
-@@ -2222,6 +2224,7 @@ public class ServerPlayer extends Player {
+@@ -2220,6 +2222,7 @@ public class ServerPlayer extends Player {
  
              this.connection.send(new ClientboundSetCameraPacket(this.camera));
              this.connection.resetPosition();
@@ -33,7 +33,7 @@ index fe5ef64df18c38cfb7912c7415ece9cc94cbc222..af8d99c2f7393bcbd10d045b72f6d8c1
          }
  
      }
-@@ -2661,6 +2664,7 @@ public class ServerPlayer extends Player {
+@@ -2659,6 +2662,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();
diff --git a/patches/server/0077-No-block-update-command.patch b/patches/server/0077-No-block-update-command.patch
index 4539349b..d947864f 100644
--- a/patches/server/0077-No-block-update-command.patch
+++ b/patches/server/0077-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 790ffade00fa3a994490e652751faa6fa03a5ed2..aa6bf9361144679821adf1b090abcef34115d1fc 100644
+index a95b794553074a8c446a55f56862ccf7c5d6c261..7e5712f0fffe2a8606c47bdfe4bfa5191aaf5bfc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java
 +++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
 @@ -2482,6 +2482,7 @@ public class ServerLevel extends Level implements WorldGenLevel {
@@ -17,10 +17,10 @@ index 790ffade00fa3a994490e652751faa6fa03a5ed2..aa6bf9361144679821adf1b090abcef3
              // CraftBukkit start
              if (this.populating) {
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 4697df75fdee2023c41260bed211e3e3d90d2b9b..8c9bc54a7007b0c5ae1c8576aeca5d05a55613d1 100644
+index d0f7baa80cb7d0883304abe2ed990c258a0d92b6..a314d3aa9b2cf22bc34ac54ba1552138ad39191a 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -459,7 +459,7 @@ public final class ItemStack {
+@@ -461,7 +461,7 @@ public final class ItemStack {
                          net.minecraft.world.level.block.state.BlockState block = world.getBlockState(newblockposition);
  
                          if (!(block.getBlock() instanceof BaseEntityBlock)) { // Containers get placed automatically
diff --git a/patches/server/0093-Reduce-array-allocations.patch b/patches/server/0093-Reduce-array-allocations.patch
index f1941c79..7e42ab7b 100644
--- a/patches/server/0093-Reduce-array-allocations.patch
+++ b/patches/server/0093-Reduce-array-allocations.patch
@@ -398,7 +398,7 @@ index 2e324276ea4cd9e528c6a3f9a9ba394b378fe075..8d949983a30f27a60982f6b406151408
      private EquipmentSlot(EquipmentSlot.Type type, int entityId, int armorStandId, String name) {
          this.type = type;
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 28f4271a6d89e770138e0dc3ee8833f059e79329..dba49ae89098798b3d74f71cf18f6937778faaaf 100644
+index eea0eb67b3f74574d8dcd8cad30394f3a49cb2cd..8360805905810eae915a61b2e41aedf232c106da 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -3146,7 +3146,7 @@ public abstract class LivingEntity extends Entity implements Attackable {
@@ -464,10 +464,10 @@ index 94396ad1a3c280787d36c6c18256d10340ace488..ae0de0d0cb970a10a8a612cf34810a36
  
          for (int j = 0; j < i; ++j) {
 diff --git a/src/main/java/net/minecraft/world/item/ItemStack.java b/src/main/java/net/minecraft/world/item/ItemStack.java
-index 8c9bc54a7007b0c5ae1c8576aeca5d05a55613d1..2a0ea91caace8fc04890ca4b45283e09e36265b1 100644
+index a314d3aa9b2cf22bc34ac54ba1552138ad39191a..e46f323e0b11bc22b7c4c07f313cbba501eb0cc0 100644
 --- a/src/main/java/net/minecraft/world/item/ItemStack.java
 +++ b/src/main/java/net/minecraft/world/item/ItemStack.java
-@@ -1025,7 +1025,7 @@ public final class ItemStack {
+@@ -1027,7 +1027,7 @@ public final class ItemStack {
          int k;
  
          if (ItemStack.shouldShowInTooltip(i, ItemStack.TooltipPart.MODIFIERS)) {
diff --git a/patches/server/0101-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0101-Skip-entity-move-if-movement-is-zero.patch
index fd4b4d9c..49cca6ca 100644
--- a/patches/server/0101-Skip-entity-move-if-movement-is-zero.patch
+++ b/patches/server/0101-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 4fdacff42533daa0cd4eabc25b5f30cbc9bbbfb4..f0ccd174fb7fa56ab3cd387d6680e8c5e5ecb5c3 100644
+index b0056c266ef358b4784b6ce4539806810e1904b9..a88e7d5fae43abb8ee5d3111d53100e27cd11350 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -314,6 +314,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -31,7 +31,7 @@ index 4fdacff42533daa0cd4eabc25b5f30cbc9bbbfb4..f0ccd174fb7fa56ab3cd387d6680e8c5
          // Paper start - detailed watchdog information
          io.papermc.paper.util.TickThread.ensureTickThread("Cannot move an entity off-main");
          synchronized (this.posLock) {
-@@ -4021,6 +4029,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
+@@ -4047,6 +4055,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
      }
  
      public final void setBoundingBox(AABB boundingBox) {
diff --git a/patches/server/0109-Force-peaceful-mode-switch.patch b/patches/server/0109-Force-peaceful-mode-switch.patch
index 6d542d17..f49211b9 100644
--- a/patches/server/0109-Force-peaceful-mode-switch.patch
+++ b/patches/server/0109-Force-peaceful-mode-switch.patch
@@ -100,10 +100,10 @@ index 7eec9dc8237ff04c53b573c3cc87e6cdbfdda7ed..2aafb872578d266f2826e5bddebc9b4a
              boolean spawnThisTick = true;
              int limit = enumcreaturetype.getMaxInstancesPerChunk();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f19f2199cac5a7eb275f40cc23472416a40ec0da..559757fa8f3604a0803a7baf166772fd1520ba7c 100644
+index 90c76ddcb8af13409490b8976263d27a71954668..da1b4a6dcb87d81b5fb1bfd2f2fd924b59161792 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2358,6 +2358,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
+@@ -2364,6 +2364,18 @@ public class CraftWorld extends CraftRegionAccessor implements World {
          return CraftFeatureFlag.getFromNMS(this.getHandle().enabledFeatures()).stream().map(FeatureFlag.class::cast).collect(Collectors.toUnmodifiableSet());
      }
  
diff --git a/patches/server/0112-Leaves-tick-command.patch b/patches/server/0112-Leaves-tick-command.patch
index 5ad0359b..a8878722 100644
--- a/patches/server/0112-Leaves-tick-command.patch
+++ b/patches/server/0112-Leaves-tick-command.patch
@@ -109,10 +109,10 @@ index a890c2afd91c250e9b06e826a0eaa4d1eadf5a00..863abf6a15cc35bceb18e20a4e2798d3
          ReportedException reportedexception = null;
  
 diff --git a/src/main/java/net/minecraft/server/level/ServerPlayer.java b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-index af8d99c2f7393bcbd10d045b72f6d8c17c0b7929..466c581d5c076f1eff56178c0bf85973fc6da91c 100644
+index 21aa07c96ebc7f760ecf8fa62da7dc6738c2cf93..c806c7d445dd04600504f869cfcbd2991cba65dc 100644
 --- a/src/main/java/net/minecraft/server/level/ServerPlayer.java
 +++ b/src/main/java/net/minecraft/server/level/ServerPlayer.java
-@@ -2742,7 +2742,7 @@ public class ServerPlayer extends Player {
+@@ -2740,7 +2740,7 @@ public class ServerPlayer extends Player {
      }
  
      public boolean allowOperation() {