diff --git a/gradle.properties b/gradle.properties
index 3b78ee1..1d5d6a9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -2,7 +2,7 @@ group=org.galemc.gale
 version=1.21-R0.1-SNAPSHOT
 
 mcVersion=1.21
-paperRef=5e7cd0784b877020c9b418f3d79268ce9bb854fb
+paperRef=c84a3b541c8fda6fe57fae028bbb94d8fbd38cfd
 
 updatingMinecraft=true
 
diff --git a/patches/server/0017-Remove-vanilla-profiler.patch b/patches/server/0017-Remove-vanilla-profiler.patch
index 6afb156..8e9156b 100644
--- a/patches/server/0017-Remove-vanilla-profiler.patch
+++ b/patches/server/0017-Remove-vanilla-profiler.patch
@@ -1128,10 +1128,10 @@ index 298e3eddd600f0b2e48ce2d4080cf68adff59a3a..6b3c57fc1231cd37e17a58137bb78411
  
      protected abstract T prepare(ResourceManager manager, ProfilerFiller profiler);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 14db8510af7465eb663501008ca35f8ec63bfe30..bf69dd0f673e86fb2de6251bedcf36e4577933d9 100644
+index 898651b7cfff15fe1afb690c247cdc3936d12fa6..43740e99f0408c43d3342d63a096e22bfbafb240 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -806,7 +806,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -837,7 +837,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      // CraftBukkit end
  
      public void baseTick() {
@@ -1139,7 +1139,7 @@ index 14db8510af7465eb663501008ca35f8ec63bfe30..bf69dd0f673e86fb2de6251bedcf36e4
          if (firstTick && this instanceof net.minecraft.world.entity.NeutralMob neutralMob) neutralMob.tickInitialPersistentAnger(level); // Paper - Prevent entity loading causing async lookups
          this.inBlockState = null;
          if (this.isPassenger() && this.getVehicle().isRemoved()) {
-@@ -870,8 +869,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -901,8 +900,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          if (!this.level().isClientSide && this instanceof Leashable) {
              Leashable.tickLeash((Entity & Leashable) this); // CraftBukkit - decompile error
          }
@@ -1148,7 +1148,7 @@ index 14db8510af7465eb663501008ca35f8ec63bfe30..bf69dd0f673e86fb2de6251bedcf36e4
      }
  
      public void setSharedFlagOnFire(boolean onFire) {
-@@ -1049,7 +1046,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1080,7 +1077,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  }
              }
  
@@ -1156,7 +1156,7 @@ index 14db8510af7465eb663501008ca35f8ec63bfe30..bf69dd0f673e86fb2de6251bedcf36e4
              if (this.stuckSpeedMultiplier.lengthSqr() > 1.0E-7D) {
                  movement = movement.multiply(this.stuckSpeedMultiplier);
                  this.stuckSpeedMultiplier = Vec3.ZERO;
-@@ -1079,8 +1075,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1110,8 +1106,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  this.setPos(this.getX() + vec3d1.x, this.getY() + vec3d1.y, this.getZ() + vec3d1.z);
              }
  
@@ -1165,7 +1165,7 @@ index 14db8510af7465eb663501008ca35f8ec63bfe30..bf69dd0f673e86fb2de6251bedcf36e4
              boolean flag = !Mth.equal(movement.x, vec3d1.x);
              boolean flag1 = !Mth.equal(movement.z, vec3d1.z);
  
-@@ -1098,9 +1092,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1129,9 +1123,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              BlockState iblockdata = this.level().getBlockState(blockposition);
  
              this.checkFallDamage(vec3d1.y, this.onGround(), iblockdata, blockposition);
@@ -1176,7 +1176,7 @@ index 14db8510af7465eb663501008ca35f8ec63bfe30..bf69dd0f673e86fb2de6251bedcf36e4
                  if (this.horizontalCollision) {
                      Vec3 vec3d2 = this.getDeltaMovement();
  
-@@ -1201,8 +1193,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1232,8 +1224,6 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  if (this.isOnFire() && (this.isInPowderSnow || this.isInWaterRainOrBubble())) {
                      this.setRemainingFireTicks(-this.getFireImmuneTicks());
                  }
@@ -1186,7 +1186,7 @@ index 14db8510af7465eb663501008ca35f8ec63bfe30..bf69dd0f673e86fb2de6251bedcf36e4
          }
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index f35c9b1ee4bb99a4fad269b5f0cc46b8a1f3adfb..5021c4618c8302e103fb2595a8d3df26f7479140 100644
+index e980c8c356b30d25e2fc5a73b91ad2c6edd4fe05..9ea779dbe9e6056b436f107453666ef6d0379662 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -440,7 +440,6 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0037-Reduce-entity-fluid-lookups-if-no-fluids.patch b/patches/server/0037-Reduce-entity-fluid-lookups-if-no-fluids.patch
index eb65ad8..a26c1b7 100644
--- a/patches/server/0037-Reduce-entity-fluid-lookups-if-no-fluids.patch
+++ b/patches/server/0037-Reduce-entity-fluid-lookups-if-no-fluids.patch
@@ -31,10 +31,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 12a23899497ee4a9666cfbee1bc2e535812512d4..795f7ac6479648fbfc34a3eb2ff954202f27789e 100644
+index d676561e1646f673b710abab38f565aadbc0ab28..7b4649b774a9e9cf248225494d386761a8edd2c8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4255,16 +4255,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4286,16 +4286,18 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public boolean updateFluidHeightAndDoFluidPushing(TagKey<Fluid> tag, double speed) {
@@ -60,7 +60,7 @@ index 12a23899497ee4a9666cfbee1bc2e535812512d4..795f7ac6479648fbfc34a3eb2ff95420
              double d1 = 0.0D;
              boolean flag = this.isPushedByFluid();
              boolean flag1 = false;
-@@ -4272,14 +4274,61 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4303,14 +4305,61 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
              int k1 = 0;
              BlockPos.MutableBlockPos blockposition_mutableblockposition = new BlockPos.MutableBlockPos();
  
@@ -128,7 +128,7 @@ index 12a23899497ee4a9666cfbee1bc2e535812512d4..795f7ac6479648fbfc34a3eb2ff95420
  
                              if (d2 >= axisalignedbb.minY) {
                                  flag1 = true;
-@@ -4301,9 +4350,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4332,9 +4381,12 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                                  // CraftBukkit end
                              }
                          }
diff --git a/patches/server/0049-Do-not-process-chat-commands-before-player-has-joine.patch b/patches/server/0049-Do-not-process-chat-commands-before-player-has-joine.patch
index eb8856a..b8d59e0 100644
--- a/patches/server/0049-Do-not-process-chat-commands-before-player-has-joine.patch
+++ b/patches/server/0049-Do-not-process-chat-commands-before-player-has-joine.patch
@@ -25,10 +25,10 @@ index 3d1aff8318620bc87a439e095bc1d06e4dafbba1..79b49aec7c5c80948b8f1c77ca6e4804
      public boolean isRealPlayer; // Paper
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<ServerPlayer> cachedSingleHashSet; // Paper
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index 7ed1a93a7ecf993d2ee3825affa61be1d661dfc7..bb143cc9bfe8ee0302955ed61c876eace149f9ca 100644
+index d20bd61a280e010a0542c6509273a3d25aa561fa..1308b82d293b7c2b84f8c74d3d655e6a9e87c2c8 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-@@ -2284,7 +2284,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2285,7 +2285,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
              this.disconnect((Component) Component.translatable("multiplayer.disconnect.illegal_characters"), org.bukkit.event.player.PlayerKickEvent.Cause.ILLEGAL_CHARACTERS); // Paper
          } else if (this.player.isRemoved() || this.player.getChatVisibility() == ChatVisiblity.HIDDEN) { // CraftBukkit - dead men tell no tales
              this.send(new ClientboundSystemChatPacket(Component.translatable("chat.disabled.options").withStyle(ChatFormatting.RED), false));
@@ -38,7 +38,7 @@ index 7ed1a93a7ecf993d2ee3825affa61be1d661dfc7..bb143cc9bfe8ee0302955ed61c876eac
              // CraftBukkit start
              if (sync) {
 diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
-index 0d0b07c9199be9ca0d5ac3feb1d44f149ba69283..6aa5713fb0794a56985630c4616afdf5728d98d7 100644
+index 3d30427e75bdfb9cf453fb5cd2a344227da1641a..fc2e0a9ff78089b9e3e621ccb892f281e9bee47b 100644
 --- a/src/main/java/net/minecraft/server/players/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/players/PlayerList.java
 @@ -350,6 +350,8 @@ public abstract class PlayerList {
diff --git a/patches/server/0051-Do-not-log-empty-message-warnings.patch b/patches/server/0051-Do-not-log-empty-message-warnings.patch
index f21cf0e..47cfa1c 100644
--- a/patches/server/0051-Do-not-log-empty-message-warnings.patch
+++ b/patches/server/0051-Do-not-log-empty-message-warnings.patch
@@ -7,7 +7,7 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index bb143cc9bfe8ee0302955ed61c876eace149f9ca..d3319dcb15ee727b42d3bc09e06793cf728f1c6b 100644
+index 1308b82d293b7c2b84f8c74d3d655e6a9e87c2c8..794d9aa6f54f9c68dc4a65c7e3d2d247d742cabc 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -194,6 +194,7 @@ import net.minecraft.world.phys.shapes.BooleanOp;
@@ -18,7 +18,7 @@ index bb143cc9bfe8ee0302955ed61c876eace149f9ca..d3319dcb15ee727b42d3bc09e06793cf
  import org.galemc.gale.configuration.GaleGlobalConfiguration;
  import org.slf4j.Logger;
  
-@@ -2442,7 +2443,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -2443,7 +2444,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
          // CraftBukkit start
          String s = message.signedContent();
          if (s.isEmpty()) {
diff --git a/patches/server/0072-Optimize-sun-burn-tick.patch b/patches/server/0072-Optimize-sun-burn-tick.patch
index bc00916..d7be266 100644
--- a/patches/server/0072-Optimize-sun-burn-tick.patch
+++ b/patches/server/0072-Optimize-sun-burn-tick.patch
@@ -13,7 +13,7 @@ As part of: JettPack (https://gitlab.com/Titaniumtown/JettPack)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9a8bcf6c11f885a711dff08dfa8f87d9f3deef54..a5e51025e6c2d5fea903b7c1d950ba430966d36d 100644
+index 251ff6f9a347cba08f06f37e2680551d420bb08d..ba0e7bc1dd98ea632ab80091acb900b862186dad 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -314,7 +314,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -25,7 +25,7 @@ index 9a8bcf6c11f885a711dff08dfa8f87d9f3deef54..a5e51025e6c2d5fea903b7c1d950ba43
      public BlockPos blockPosition; // Gale - Pufferfish - optimize entity coordinate key - private -> public
      private ChunkPos chunkPosition;
      private Vec3 deltaMovement;
-@@ -1927,9 +1927,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1958,9 +1958,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      /** @deprecated */
      @Deprecated
      public float getLightLevelDependentMagicValue() {
diff --git a/patches/server/0087-Skip-entity-move-if-movement-is-zero.patch b/patches/server/0087-Skip-entity-move-if-movement-is-zero.patch
index 7b2c3ba..68511b0 100644
--- a/patches/server/0087-Skip-entity-move-if-movement-is-zero.patch
+++ b/patches/server/0087-Skip-entity-move-if-movement-is-zero.patch
@@ -13,7 +13,7 @@ As part of: VMP (https://github.com/RelativityMC/VMP-fabric)
 Licensed under: MIT (https://opensource.org/licenses/MIT)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index a5e51025e6c2d5fea903b7c1d950ba430966d36d..db0be6ca1ae9c78b8143a7f6a13889d68a0afe38 100644
+index ba0e7bc1dd98ea632ab80091acb900b862186dad..329856d3656da0fd01ab1500a423cae554d2544a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -323,6 +323,7 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
@@ -24,7 +24,7 @@ index a5e51025e6c2d5fea903b7c1d950ba430966d36d..db0be6ca1ae9c78b8143a7f6a13889d6
      public boolean onGround;
      public boolean horizontalCollision;
      public boolean verticalCollision;
-@@ -1033,6 +1034,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1064,6 +1065,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public void move(MoverType movementType, Vec3 movement) {
@@ -36,7 +36,7 @@ index a5e51025e6c2d5fea903b7c1d950ba430966d36d..db0be6ca1ae9c78b8143a7f6a13889d6
          final Vec3 originalMovement = movement; // Paper - Expose pre-collision velocity
          if (this.noPhysics) {
              this.setPos(this.getX() + movement.x, this.getY() + movement.y, this.getZ() + movement.z);
-@@ -3954,6 +3960,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3985,6 +3991,11 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      }
  
      public final void setBoundingBox(AABB boundingBox) {
diff --git a/patches/server/0092-Hide-flames-on-entities-with-fire-resistance.patch b/patches/server/0092-Hide-flames-on-entities-with-fire-resistance.patch
index 80b78de..07f5f9f 100644
--- a/patches/server/0092-Hide-flames-on-entities-with-fire-resistance.patch
+++ b/patches/server/0092-Hide-flames-on-entities-with-fire-resistance.patch
@@ -13,10 +13,10 @@ As part of: Slice (https://github.com/Cryptite/Slice)
 Licensed under: MIT (https://opensource.org/licenses/MIT)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index db0be6ca1ae9c78b8143a7f6a13889d68a0afe38..4dd79b1595406dfd93b2dd6e2ef56f7bf4db65c6 100644
+index 329856d3656da0fd01ab1500a423cae554d2544a..32c6c4f8bdc2510a9fbce18be4cf64cbe21e6f10 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -864,7 +864,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -895,7 +895,13 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
  
          this.checkBelowWorld();
          if (!this.level().isClientSide) {
diff --git a/patches/server/0098-Send-multiple-keep-alive-packets.patch b/patches/server/0098-Send-multiple-keep-alive-packets.patch
index b348277..c82b949 100644
--- a/patches/server/0098-Send-multiple-keep-alive-packets.patch
+++ b/patches/server/0098-Send-multiple-keep-alive-packets.patch
@@ -130,7 +130,7 @@ index 8757a6ac609d463f94846d66fe04f50e859e7ce8..a720a05c47b2137a07515461960603cc
  
      }
 diff --git a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
-index d3319dcb15ee727b42d3bc09e06793cf728f1c6b..9dcbc2439e21a37793e8134e0715836fb88d9f78 100644
+index 794d9aa6f54f9c68dc4a65c7e3d2d247d742cabc..086249f14abd7479e8444d9153394b29a8982267 100644
 --- a/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 +++ b/src/main/java/net/minecraft/server/network/ServerGamePacketListenerImpl.java
 @@ -9,6 +9,8 @@ import com.mojang.brigadier.suggestion.Suggestions;
@@ -142,7 +142,7 @@ index d3319dcb15ee727b42d3bc09e06793cf728f1c6b..9dcbc2439e21a37793e8134e0715836f
  import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
  import it.unimi.dsi.fastutil.objects.ObjectIterator;
  import java.net.SocketAddress;
-@@ -3412,6 +3414,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
+@@ -3413,6 +3415,7 @@ public class ServerGamePacketListenerImpl extends ServerCommonPacketListenerImpl
      }
  
      @Override
diff --git a/patches/server/0100-Load-portal-destination-chunk-before-entity-teleport.patch b/patches/server/0100-Load-portal-destination-chunk-before-entity-teleport.patch
index 166389a..788a9af 100644
--- a/patches/server/0100-Load-portal-destination-chunk-before-entity-teleport.patch
+++ b/patches/server/0100-Load-portal-destination-chunk-before-entity-teleport.patch
@@ -13,10 +13,10 @@ As part of: MultiPaper (https://github.com/MultiPaper/MultiPaper)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 4dd79b1595406dfd93b2dd6e2ef56f7bf4db65c6..e22174b5c5927fca637167e4a752c415a613821a 100644
+index 32c6c4f8bdc2510a9fbce18be4cf64cbe21e6f10..e61d03c775d05fe33ce7f2ca7c83ac4d7b55c8cf 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3829,7 +3829,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -3860,7 +3860,15 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
  
              if (entity == null) {
                  return false;
diff --git a/patches/server/0102-Don-t-load-chunks-to-activate-climbing-entities.patch b/patches/server/0102-Don-t-load-chunks-to-activate-climbing-entities.patch
index bcc528a..feebf28 100644
--- a/patches/server/0102-Don-t-load-chunks-to-activate-climbing-entities.patch
+++ b/patches/server/0102-Don-t-load-chunks-to-activate-climbing-entities.patch
@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e22174b5c5927fca637167e4a752c415a613821a..9c781d585d3ec7e42c036f8ee4e1a38a64ee8a55 100644
+index e61d03c775d05fe33ce7f2ca7c83ac4d7b55c8cf..36190c0b1417c943e9763db96d3a7c72f02dd149 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -4477,6 +4477,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -4508,6 +4508,16 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
          return this.inBlockState;
      }
  
@@ -28,7 +28,7 @@ index e22174b5c5927fca637167e4a752c415a613821a..9c781d585d3ec7e42c036f8ee4e1a38a
          return this.chunkPosition;
      }
 diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
-index 7bdf29e3f71aa995a3125176ef4e62c7a6d4d8fe..93f9905bbb47d89c746957f4e3e75e13322e2a5e 100644
+index 41c213db8320331577801a46b469c77fd504c2f9..60493d257489affb2e622d9c7193e1f8e7fad412 100644
 --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
 +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
 @@ -2042,19 +2042,43 @@ public abstract class LivingEntity extends Entity implements Attackable {
diff --git a/patches/server/0116-For-collision-check-has-physics-before-same-vehicle.patch b/patches/server/0116-For-collision-check-has-physics-before-same-vehicle.patch
index a3559a0..2d9220f 100644
--- a/patches/server/0116-For-collision-check-has-physics-before-same-vehicle.patch
+++ b/patches/server/0116-For-collision-check-has-physics-before-same-vehicle.patch
@@ -16,10 +16,10 @@ As part of: Akarin (https://github.com/Akarin-project/Akarin)
 Licensed under: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 9c781d585d3ec7e42c036f8ee4e1a38a64ee8a55..6650f27d1678ed6cb188f537931eaf3e3d40c7dd 100644
+index 36190c0b1417c943e9763db96d3a7c72f02dd149..9190b26c81c1060b7c3a71b1e584b8f9b8e79852 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2054,8 +2054,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -2085,8 +2085,8 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
      public void playerTouch(Player player) {}
  
      public void push(Entity entity) {
diff --git a/patches/server/0117-Skip-negligible-planar-movement-multiplication.patch b/patches/server/0117-Skip-negligible-planar-movement-multiplication.patch
index d391a86..7c4a324 100644
--- a/patches/server/0117-Skip-negligible-planar-movement-multiplication.patch
+++ b/patches/server/0117-Skip-negligible-planar-movement-multiplication.patch
@@ -7,10 +7,10 @@ License: GPL-3.0 (https://www.gnu.org/licenses/gpl-3.0.html)
 Gale - https://galemc.org
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6650f27d1678ed6cb188f537931eaf3e3d40c7dd..448352d75cad0f016684079f2e14c667e1cecf32 100644
+index 9190b26c81c1060b7c3a71b1e584b8f9b8e79852..28782b46cef81a0ee049be902ca60ddb9fd5d852 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1188,9 +1188,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
+@@ -1219,9 +1219,19 @@ public abstract class Entity implements SyncedDataHolder, Nameable, EntityAccess
                  }
  
                  this.tryCheckInsideBlocks();