diff --git a/Paper b/Paper
index d5f3458c8..abca14ff9 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit d5f3458c8c30f3dd116de20a07d5ed1cdbfa7611
+Subproject commit abca14ff961c4c67615aad7bba6287140d02af56
diff --git a/patches/api/0024-Ridables.patch b/patches/api/0024-Ridables.patch
index d84127a46..fc251fc33 100644
--- a/patches/api/0024-Ridables.patch
+++ b/patches/api/0024-Ridables.patch
@@ -169,10 +169,10 @@ index 0000000000000000000000000000000000000000..c0ec5a130985e8da4cc9e596a6b70503
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index ff2e4fc8a632453e280f1a6ec05878b0e7fd2a9c..cd209dcfbb81010e916b40d61d0a038c75a6f788 100644
+index 76e857c364fe79e20cf9bde54b65e5b7108174fd..5f7947cd6f3bf9f76e8b3bac339f61b9afadaaad 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -696,4 +696,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -698,4 +698,35 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      public boolean isTicking();
      // Paper end
diff --git a/patches/api/0035-Fix-javadoc-warnings-missing-param-and-return.patch b/patches/api/0035-Fix-javadoc-warnings-missing-param-and-return.patch
index dcf2e528c..454eb431e 100644
--- a/patches/api/0035-Fix-javadoc-warnings-missing-param-and-return.patch
+++ b/patches/api/0035-Fix-javadoc-warnings-missing-param-and-return.patch
@@ -881,10 +881,10 @@ index d9be83961b28b927a587f6dbb339b531520e4865..1ff4c5e283ac05c405c09bd4b8530664
  
      /**
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index cd209dcfbb81010e916b40d61d0a038c75a6f788..77cb59f180abda6d92208614be5461251111bed8 100644
+index 5f7947cd6f3bf9f76e8b3bac339f61b9afadaaad..08dbe8208fad174f03a0e08c26bb48a0729ec0ce 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -615,6 +615,9 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -622,6 +622,9 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
      Pose getPose();
  
      // Spigot start
@@ -894,14 +894,7 @@ index cd209dcfbb81010e916b40d61d0a038c75a6f788..77cb59f180abda6d92208614be546125
      public class Spigot extends CommandSender.Spigot {
  
      }
-@@ -658,41 +661,57 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
- 
-     /**
-      * Check if entity is in water
-+     *
-+     * @return True if entity is in water
-      */
-     public boolean isInWater();
+@@ -665,36 +668,50 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
  
      /**
       * Check if entity is in rain
diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch
index 26d6ca5c2..9785c9c6d 100644
--- a/patches/server/0001-Tuinity-Server-Changes.patch
+++ b/patches/server/0001-Tuinity-Server-Changes.patch
@@ -7944,7 +7944,7 @@ index 550232cb3819138b3bae0fa1c51429485e8bc593..229c3b0f0c650b501f31147adaa17194
                      throwable = throwable1;
                      throw throwable1;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e44e5652c12fbee51acedc1f911181b8443fae93..d93db1049ef9421f6b3edd0dc52a421c4d1b51c2 100644
+index 091d55c04c663df07c69f637515f53990c3c2d46..a4cf9e17a450f1603d3d1ed111404afea6e1d219 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -8328,7 +8328,7 @@ index e44e5652c12fbee51acedc1f911181b8443fae93..d93db1049ef9421f6b3edd0dc52a421c
          return false;
      }
  
-@@ -2842,7 +3074,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2844,7 +3076,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              this.cp().forEach((entity) -> {
                  worldserver.chunkCheck(entity);
                  entity.az = true;
@@ -8337,7 +8337,7 @@ index e44e5652c12fbee51acedc1f911181b8443fae93..d93db1049ef9421f6b3edd0dc52a421c
  
                  while (iterator.hasNext()) {
                      Entity entity1 = (Entity) iterator.next();
-@@ -3300,12 +3532,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3302,12 +3534,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.locBlock;
      }
  
@@ -8354,7 +8354,7 @@ index e44e5652c12fbee51acedc1f911181b8443fae93..d93db1049ef9421f6b3edd0dc52a421c
      }
  
      public void setMot(double d0, double d1, double d2) {
-@@ -3360,7 +3596,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3362,7 +3598,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          }
          // Paper end
          if (this.loc.x != d0 || this.loc.y != d1 || this.loc.z != d2) {
@@ -8397,10 +8397,10 @@ index dcc5b098bfe36ef7ee8536b3da65c4ce1748c9d8..7b32a1fb79dcae355a8d95f3a8aa4284
              if (entityhuman != null) {
                  double d0 = entityhuman.h((Entity) this); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b88bd19fc3ebaf3ae467b5ad35a155505db77e6c..c57e7e1bccfc3a0cccfbaca44d9f369ec1f5683c 100644
+index 53d193fab101192ee0e0a5519b78c354122db353..6a3d73b33f04e2c66b4ba9ebe58f887048ae83d6 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2846,7 +2846,11 @@ public abstract class EntityLiving extends Entity {
+@@ -2852,7 +2852,11 @@ public abstract class EntityLiving extends Entity {
              return;
          }
          // Paper - end don't run getEntities if we're not going to use its result
@@ -8413,7 +8413,7 @@ index b88bd19fc3ebaf3ae467b5ad35a155505db77e6c..c57e7e1bccfc3a0cccfbaca44d9f369e
  
          if (!list.isEmpty()) {
              // Paper - move up
-@@ -2875,6 +2879,9 @@ public abstract class EntityLiving extends Entity {
+@@ -2881,6 +2885,9 @@ public abstract class EntityLiving extends Entity {
                  this.C(entity);
              }
          }
@@ -14917,10 +14917,10 @@ index 010f702ea44d2146b0745b2b4d21f948d16cc424..d2ec9f7f105a36a1077ac0df56b1abb4
                          //Thread.sleep(TimeUnit.SECONDS.toMillis(20));
                          // Paper End
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 4ec0e9220d2fa976dc6dfecd3eedb5b78a0ef8f4..1fe253bc7261a6077747addf8d9023ca94525999 100644
+index 475dc1aa2cba77c13033938e719a66707f358914..a6d849facba1526ae2a2b7f3fb9a140d0b50289c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -503,27 +503,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -508,27 +508,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          entity.setHeadRotation(yaw);
      }
  
@@ -14949,7 +14949,7 @@ index 4ec0e9220d2fa976dc6dfecd3eedb5b78a0ef8f4..1fe253bc7261a6077747addf8d9023ca
  
      @Override
      public boolean teleport(Location location) {
-@@ -557,6 +537,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -562,6 +542,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return true;
      }
  
diff --git a/patches/server/0009-AFK-API.patch b/patches/server/0009-AFK-API.patch
index 5630446b5..8d9c52bf2 100644
--- a/patches/server/0009-AFK-API.patch
+++ b/patches/server/0009-AFK-API.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] AFK API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index caaa01b20e5b7430b809477022f8ab35f3c5bf20..335cb9c4a98ea9922ac5bdf9ee51a9f2baeac23c 100644
+index 3ef463e1313b9729c86437f499930ab4cd332a6d..7880c329942ff96acd1d9c713c5484107c0d660f 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -84,6 +84,15 @@ public abstract class EntityHuman extends EntityLiving {
diff --git a/patches/server/0012-LivingEntity-safeFallDistance.patch b/patches/server/0012-LivingEntity-safeFallDistance.patch
index 8c6789e42..6b0b2e3d8 100644
--- a/patches/server/0012-LivingEntity-safeFallDistance.patch
+++ b/patches/server/0012-LivingEntity-safeFallDistance.patch
@@ -30,7 +30,7 @@ index fcb31147622b4b81934be05ffc8de5e821ce69b7..ce26e65aaf25a41663ecd8c935967c33
  
      protected int getChestSlots() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c57e7e1bccfc3a0cccfbaca44d9f369ec1f5683c..309a20e06461aeb362080b9aeb256f2c73d548a5 100644
+index 6a3d73b33f04e2c66b4ba9ebe58f887048ae83d6..fea03568e8af3a0b355204bab0c99fdd54913688 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -132,6 +132,7 @@ public abstract class EntityLiving extends Entity {
@@ -52,7 +52,7 @@ index c57e7e1bccfc3a0cccfbaca44d9f369ec1f5683c..309a20e06461aeb362080b9aeb256f2c
  
              if (!iblockdata.isAir()) {
                  double d1 = Math.min((double) (0.2F + f / 15.0F), 2.5D);
-@@ -1679,7 +1680,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1685,7 +1686,7 @@ public abstract class EntityLiving extends Entity {
          MobEffect mobeffect = this.getEffect(MobEffects.JUMP);
          float f2 = mobeffect == null ? 0.0F : (float) (mobeffect.getAmplifier() + 1);
  
diff --git a/patches/server/0017-EntityMoveEvent.patch b/patches/server/0017-EntityMoveEvent.patch
index 572521d5f..47ac336a4 100644
--- a/patches/server/0017-EntityMoveEvent.patch
+++ b/patches/server/0017-EntityMoveEvent.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] EntityMoveEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 309a20e06461aeb362080b9aeb256f2c73d548a5..4015804bb860f93c1a0fe4cd2596b479e6fa5a07 100644
+index fea03568e8af3a0b355204bab0c99fdd54913688..521a9acee4fa73b4801dfe50645adcd6ddf96de4 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2801,6 +2801,20 @@ public abstract class EntityLiving extends Entity {
+@@ -2807,6 +2807,20 @@ public abstract class EntityLiving extends Entity {
  
          this.collideNearby();
          this.world.getMethodProfiler().exit();
diff --git a/patches/server/0027-Giants-AI-settings.patch b/patches/server/0027-Giants-AI-settings.patch
index 440f94164..c042f169a 100644
--- a/patches/server/0027-Giants-AI-settings.patch
+++ b/patches/server/0027-Giants-AI-settings.patch
@@ -17,7 +17,7 @@ index c57e23e16b79017fe6dc084d634226cfdac772b5..92aa104dc51efa833eac289198bb9ee7
      public AttributeModifiable a(AttributeBase attributebase) {
          return (AttributeModifiable) this.b.computeIfAbsent(attributebase, (attributebase1) -> {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d93db1049ef9421f6b3edd0dc52a421c4d1b51c2..0502ba688d3d16f15fea1ddda1f7d0bcbe59d701 100644
+index a4cf9e17a450f1603d3d1ed111404afea6e1d219..a756848c54b55ecde0d46f29f05afaf0042ad080 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -136,7 +136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -147,10 +147,10 @@ index 7b32a1fb79dcae355a8d95f3a8aa4284ec5d10db..b281ca841b2b7b51add3409318e2b92d
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 4015804bb860f93c1a0fe4cd2596b479e6fa5a07..bb4d4b10df0d6946a26e2b0b13f1c4a266f2e5e1 100644
+index 521a9acee4fa73b4801dfe50645adcd6ddf96de4..e003c446402eaea3125990d34f8b42e2a3965408 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2159,7 +2159,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2165,7 +2165,7 @@ public abstract class EntityLiving extends Entity {
          this.enderTeleportTo(vec3d.x, vec3d.y, vec3d.z);
      }
  
diff --git a/patches/server/0038-Add-option-to-set-armorstand-step-height.patch b/patches/server/0038-Add-option-to-set-armorstand-step-height.patch
index 1fb8b77e9..cae98d06f 100644
--- a/patches/server/0038-Add-option-to-set-armorstand-step-height.patch
+++ b/patches/server/0038-Add-option-to-set-armorstand-step-height.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add option to set armorstand step height
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 8fef94ad9ac795311fb083a384ed98f1ea860f0a..df3fc83029ea9d06045a3f132f8e85b0c33b0649 100644
+index d6de166babe2e25a88f9e6dae462907e26b6fb6f..faa221038df6bed02a2433855ed7c7e0f89c6024 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
-@@ -618,6 +618,7 @@ public class EntityArmorStand extends EntityLiving {
+@@ -625,6 +625,7 @@ public class EntityArmorStand extends EntityLiving {
  
      @Override
      public void tick() {
diff --git a/patches/server/0041-Cows-eat-mushrooms.patch b/patches/server/0041-Cows-eat-mushrooms.patch
index b19af3f79..5bcd8cd91 100644
--- a/patches/server/0041-Cows-eat-mushrooms.patch
+++ b/patches/server/0041-Cows-eat-mushrooms.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Cows eat mushrooms
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0502ba688d3d16f15fea1ddda1f7d0bcbe59d701..bcd70f3d871ef8ef957fde3bb86c5ae29dce3d2f 100644
+index a756848c54b55ecde0d46f29f05afaf0042ad080..97035ae751f9fcbd71aea18d15671df001fac6d3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2775,6 +2775,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2777,6 +2777,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.invulnerable = flag;
      }
  
@@ -110,7 +110,7 @@ index 42e6761c8b18b79ffd3f4d5e853ea87a2c153c23..cfb009c811bd2908d38da1b0007cb7aa
      public EntityCow createChild(WorldServer worldserver, EntityAgeable entityageable) {
          return (EntityCow) EntityTypes.COW.a((World) worldserver);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index bb4d4b10df0d6946a26e2b0b13f1c4a266f2e5e1..3955e509542526ef5d9be0a4499303e2eef12f04 100644
+index e003c446402eaea3125990d34f8b42e2a3965408..8a6237c71545c3966d12b661f703bd22121e3a8d 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -80,7 +80,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/server/0050-Controllable-Minecarts.patch b/patches/server/0050-Controllable-Minecarts.patch
index 12b1ca639..bba23b2a9 100644
--- a/patches/server/0050-Controllable-Minecarts.patch
+++ b/patches/server/0050-Controllable-Minecarts.patch
@@ -22,7 +22,7 @@ index 2291135eaef64c403183724cb6e413cd7e472672..bc61aaff65a7dc1e7534452b285953b8
          super(i, j, k);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3955e509542526ef5d9be0a4499303e2eef12f04..73cf592ea678c469afd479dc5c803b1e0eac961c 100644
+index 8a6237c71545c3966d12b661f703bd22121e3a8d..791e2b103c7b00e63a3f230cec13a297fa16a545 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -98,9 +98,9 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/server/0051-Disable-loot-drops-on-death-by-cramming.patch b/patches/server/0051-Disable-loot-drops-on-death-by-cramming.patch
index e9944477c..1e2523924 100644
--- a/patches/server/0051-Disable-loot-drops-on-death-by-cramming.patch
+++ b/patches/server/0051-Disable-loot-drops-on-death-by-cramming.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Disable loot drops on death by cramming
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 73cf592ea678c469afd479dc5c803b1e0eac961c..a4d26d39a3d624dd11364b09aec1b408d4624ee5 100644
+index 791e2b103c7b00e63a3f230cec13a297fa16a545..e83f82a5dc759cab34fb890bbefcb2a2775168d3 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1484,8 +1484,10 @@ public abstract class EntityLiving extends Entity {
+@@ -1490,8 +1490,10 @@ public abstract class EntityLiving extends Entity {
  
          this.dropInventory(); // CraftBukkit - from below
          if (this.cW() && this.world.getGameRules().getBoolean(GameRules.DO_MOB_LOOT)) {
diff --git a/patches/server/0056-Fix-the-dead-lagging-the-server.patch b/patches/server/0056-Fix-the-dead-lagging-the-server.patch
index e000007b6..bfc19e23b 100644
--- a/patches/server/0056-Fix-the-dead-lagging-the-server.patch
+++ b/patches/server/0056-Fix-the-dead-lagging-the-server.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix the dead lagging the server
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index bcd70f3d871ef8ef957fde3bb86c5ae29dce3d2f..01cb91589912e1d3e4b1edf9cdc8fabfc767d0dc 100644
+index 97035ae751f9fcbd71aea18d15671df001fac6d3..a6293ead3f1fc7a95280c622e0dec7021800e0e1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1521,6 +1521,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,10 +17,10 @@ index bcd70f3d871ef8ef957fde3bb86c5ae29dce3d2f..01cb91589912e1d3e4b1edf9cdc8fabf
  
      public void f(double d0, double d1, double d2) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index a4d26d39a3d624dd11364b09aec1b408d4624ee5..aafaafb4f28ea95fca8ff62a6d6cfaf0b2fb42d0 100644
+index e83f82a5dc759cab34fb890bbefcb2a2775168d3..8d2586be431fb5ae828e822a2aaa9b7102f9a352 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2477,7 +2477,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2483,7 +2483,7 @@ public abstract class EntityLiving extends Entity {
              }
          }
  
diff --git a/patches/server/0070-Add-player-death-exp-control-options.patch b/patches/server/0070-Add-player-death-exp-control-options.patch
index a9826cb36..c7cf0106c 100644
--- a/patches/server/0070-Add-player-death-exp-control-options.patch
+++ b/patches/server/0070-Add-player-death-exp-control-options.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add player death exp control options
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 335cb9c4a98ea9922ac5bdf9ee51a9f2baeac23c..75f98741153cf63cbb6b9abfabed0451277ba801 100644
+index 7880c329942ff96acd1d9c713c5484107c0d660f..96662fce02193496b4d91578d355932493d8e31e 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -85,6 +85,8 @@ public abstract class EntityHuman extends EntityLiving {
diff --git a/patches/server/0072-Add-canSaveToDisk-to-Entity.patch b/patches/server/0072-Add-canSaveToDisk-to-Entity.patch
index 2188670f1..dd815cda5 100644
--- a/patches/server/0072-Add-canSaveToDisk-to-Entity.patch
+++ b/patches/server/0072-Add-canSaveToDisk-to-Entity.patch
@@ -17,7 +17,7 @@ index 3628b04fc4f4f4663b3780eadac6ff9e430e4900..b40cb0c7b25a9ef25dddcf01ab7b5e97
                          final EntityTypes<?> projectileType = entity.getEntityType();
                          if (savedProjectileCounts.getOrDefault(projectileType, 0) >= worldserver.paperConfig.projectileSaveLimit) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 01cb91589912e1d3e4b1edf9cdc8fabfc767d0dc..ca7189dbf4f8e71163de55ee89cad15390744f96 100644
+index a6293ead3f1fc7a95280c622e0dec7021800e0e1..5ad2461a40012bc7423b8aa97c0c092e346f22ee 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -308,6 +308,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/patches/server/0073-Configurable-void-damage-height.patch b/patches/server/0073-Configurable-void-damage-height.patch
index e9b729fed..80081a841 100644
--- a/patches/server/0073-Configurable-void-damage-height.patch
+++ b/patches/server/0073-Configurable-void-damage-height.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Configurable void damage height
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ca7189dbf4f8e71163de55ee89cad15390744f96..ea1bccdc776c6eddbad1407cdc31a889875c8909 100644
+index 5ad2461a40012bc7423b8aa97c0c092e346f22ee..0adca10e77d78f1d4d1a4fdfe208ca1f01249e6d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -611,7 +611,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/patches/server/0080-Implement-elytra-settings.patch b/patches/server/0080-Implement-elytra-settings.patch
index 21dad55ed..602058f0b 100644
--- a/patches/server/0080-Implement-elytra-settings.patch
+++ b/patches/server/0080-Implement-elytra-settings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Implement elytra settings
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index aafaafb4f28ea95fca8ff62a6d6cfaf0b2fb42d0..4ffad61ce7ec81e9e329c117c9d122c51dbb4f69 100644
+index 8d2586be431fb5ae828e822a2aaa9b7102f9a352..4e1796c06b35c8d262f67900f5079ecd42fa03df 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2836,7 +2836,16 @@ public abstract class EntityLiving extends Entity {
+@@ -2842,7 +2842,16 @@ public abstract class EntityLiving extends Entity {
              if (itemstack.getItem() == Items.ELYTRA && ItemElytra.d(itemstack)) {
                  flag = true;
                  if (!this.world.isClientSide && (this.be + 1) % 20 == 0) {
diff --git a/patches/server/0081-Item-entity-immunities.patch b/patches/server/0081-Item-entity-immunities.patch
index 6df6dca08..df90c6b78 100644
--- a/patches/server/0081-Item-entity-immunities.patch
+++ b/patches/server/0081-Item-entity-immunities.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Item entity immunities
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ea1bccdc776c6eddbad1407cdc31a889875c8909..c2692d6d667d6404a044f1ad1c24e612b6efcd30 100644
+index 0adca10e77d78f1d4d1a4fdfe208ca1f01249e6d..9dfcc915548c07d35ef3b49c8e1d04b0db78ef17 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1470,6 +1470,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/patches/server/0084-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0084-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
index 61aa94483..ba94b5480 100644
--- a/patches/server/0084-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
+++ b/patches/server/0084-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
@@ -17,7 +17,7 @@ index 6fe5678cffc2487fe00c953d772f764bb37a4b11..bd0267ee4b3782f6d1ec39cba7966ba4
          return (new EntityDamageSourceIndirect("indirectMagic", entity, entity1)).setIgnoreArmor().setMagic();
      }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c2692d6d667d6404a044f1ad1c24e612b6efcd30..477e95ebecea183a2ad3d1daac3b4010b7263c99 100644
+index 9dfcc915548c07d35ef3b49c8e1d04b0db78ef17..129e86910b199f99bf373887e7940a8df9ee8089 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2135,8 +2135,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/patches/server/0091-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch b/patches/server/0091-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
index 943042e9a..f05cd0c54 100644
--- a/patches/server/0091-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
+++ b/patches/server/0091-Add-option-to-teleport-to-spawn-if-outside-world-bor.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add option to teleport to spawn if outside world border
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 4ffad61ce7ec81e9e329c117c9d122c51dbb4f69..6046b4788ba8f170e6f5fa021750936f108ab195 100644
+index 4e1796c06b35c8d262f67900f5079ecd42fa03df..e6b390709d7e3d8596a7814422e4d41fba0c11c2 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -277,6 +277,7 @@ public abstract class EntityLiving extends Entity {
diff --git a/patches/server/0098-Totems-work-in-inventory.patch b/patches/server/0098-Totems-work-in-inventory.patch
index ea51c0d56..7b83c9a97 100644
--- a/patches/server/0098-Totems-work-in-inventory.patch
+++ b/patches/server/0098-Totems-work-in-inventory.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Totems work in inventory
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 6046b4788ba8f170e6f5fa021750936f108ab195..3ae8296c29f85d7713ce3186ca463939256d7cda 100644
+index e6b390709d7e3d8596a7814422e4d41fba0c11c2..03a6a96406ba13ffe3031aacd4a6f6a9d88b9b72 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1318,6 +1318,19 @@ public abstract class EntityLiving extends Entity {
+@@ -1324,6 +1324,19 @@ public abstract class EntityLiving extends Entity {
                  }
              }
  
diff --git a/patches/server/0110-Stop-squids-floating-on-top-of-water.patch b/patches/server/0110-Stop-squids-floating-on-top-of-water.patch
index df89e1855..4de75c2eb 100644
--- a/patches/server/0110-Stop-squids-floating-on-top-of-water.patch
+++ b/patches/server/0110-Stop-squids-floating-on-top-of-water.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Stop squids floating on top of water
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 477e95ebecea183a2ad3d1daac3b4010b7263c99..a12bcda00cb615b0832157f633c4a987e78c8404 100644
+index 129e86910b199f99bf373887e7940a8df9ee8089..88a034bb8eded45ec6e670a69f04b07b28be211a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -3438,8 +3438,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3440,8 +3440,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.lastYaw = this.yaw;
      }
  
diff --git a/patches/server/0111-Ridables.patch b/patches/server/0111-Ridables.patch
index 83d812c4e..23fb34ec3 100644
--- a/patches/server/0111-Ridables.patch
+++ b/patches/server/0111-Ridables.patch
@@ -161,7 +161,7 @@ index bd0267ee4b3782f6d1ec39cba7966ba4f62f1adf..8b36ac2b0950a827763aa2357700f37e
          this.B = true;
          return this;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d42784775fb1626e 100644
+index 88a034bb8eded45ec6e670a69f04b07b28be211a..64b746151368fbec60a706f1ad51a963d7a9193f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -80,7 +80,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -243,7 +243,7 @@ index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d4278477
              this.passengers.remove(entity);
              entity.j = 60;
          }
-@@ -2535,6 +2550,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2537,6 +2552,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.setFlag(4, flag);
      }
  
@@ -251,7 +251,7 @@ index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d4278477
      public boolean bE() {
          return this.glowing || this.world.isClientSide && this.getFlag(6);
      }
-@@ -2757,6 +2773,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2759,6 +2775,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      public void setHeadRotation(float f) {}
  
@@ -259,7 +259,7 @@ index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d4278477
      public void n(float f) {}
  
      public boolean bL() {
-@@ -3191,6 +3208,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3193,6 +3210,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return false;
      }
  
@@ -278,7 +278,7 @@ index a12bcda00cb615b0832157f633c4a987e78c8404..3eef1534c0dc3c6089f0d619d4278477
      @Override
      public void sendMessage(IChatBaseComponent ichatbasecomponent, UUID uuid) {}
  
-@@ -3643,4 +3672,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3645,4 +3674,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return ((ChunkProviderServer) world.getChunkProvider()).isInEntityTickingChunk(this);
      }
      // Paper end
@@ -2143,10 +2143,10 @@ index 0e98173607c810e0e74552a2ba8febf292357c39..559ba50977147b8e2a0e7c1e7dc281fa
 +    protected void eV() { if (world.purpurConfig.zombieHorseCanSwim) goalSelector.a(0, new PathfinderGoalFloat(this)); } // Purpur
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 75f98741153cf63cbb6b9abfabed0451277ba801..deb6c93426e35c47fbe23dba71bd1712f4dba652 100644
+index 96662fce02193496b4d91578d355932493d8e31e..9963cef9298eb6d3e2ee6a24d9b1998e765123ac 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
-@@ -2148,4 +2148,15 @@ public abstract class EntityHuman extends EntityLiving {
+@@ -2155,4 +2155,15 @@ public abstract class EntityHuman extends EntityLiving {
              return this.g;
          }
      }
@@ -2372,7 +2372,7 @@ index bdff2368836dca230a6622a205d5772834afc6ee..9ee03b233b71d1b4b85a9a5e1f0ea9fe
                  float f1 = 1.0F + (this.random.nextFloat() - this.random.nextFloat()) * 0.2F;
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3ae8296c29f85d7713ce3186ca463939256d7cda..f730fa484b770eb41ce1fe4f7765b77866472798 100644
+index 03a6a96406ba13ffe3031aacd4a6f6a9d88b9b72..29fdb7c682eda00e04431cecea57f2f395ac2cb3 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -459,7 +459,7 @@ public abstract class EntityLiving extends Entity {
@@ -2384,7 +2384,7 @@ index 3ae8296c29f85d7713ce3186ca463939256d7cda..f730fa484b770eb41ce1fe4f7765b778
      }
  
      protected void cU() {
-@@ -2179,7 +2179,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2185,7 +2185,7 @@ public abstract class EntityLiving extends Entity {
          return 0.42F * this.getBlockJumpFactor();
      }
  
@@ -2393,7 +2393,7 @@ index 3ae8296c29f85d7713ce3186ca463939256d7cda..f730fa484b770eb41ce1fe4f7765b778
          float f = this.dJ();
  
          if (this.hasEffect(MobEffects.JUMP)) {
-@@ -2428,10 +2428,12 @@ public abstract class EntityLiving extends Entity {
+@@ -2434,10 +2434,12 @@ public abstract class EntityLiving extends Entity {
          return this.onGround ? this.dN() * (0.21600002F / (f * f * f)) : this.aE;
      }
  
@@ -2406,7 +2406,7 @@ index 3ae8296c29f85d7713ce3186ca463939256d7cda..f730fa484b770eb41ce1fe4f7765b778
      public void q(float f) {
          this.bu = f;
      }
-@@ -2831,6 +2833,20 @@ public abstract class EntityLiving extends Entity {
+@@ -2837,6 +2839,20 @@ public abstract class EntityLiving extends Entity {
              }
          }
          // Purpur end
@@ -6352,10 +6352,10 @@ index 0000000000000000000000000000000000000000..3059078c37deb35fcd20e27767f9b795
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 1fe253bc7261a6077747addf8d9023ca94525999..bf387664c2f509ff047b2cbaa3d6619a0718f5e9 100644
+index a6d849facba1526ae2a2b7f3fb9a140d0b50289c..b56ca054b37f5887e13b481baad8132f1d28638b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1159,4 +1159,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1160,4 +1160,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return getHandle().isTicking();
      }
      // Paper end
diff --git a/patches/server/0114-Entities-can-use-portals-configuration.patch b/patches/server/0114-Entities-can-use-portals-configuration.patch
index dfae7dddd..f09905774 100644
--- a/patches/server/0114-Entities-can-use-portals-configuration.patch
+++ b/patches/server/0114-Entities-can-use-portals-configuration.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Entities can use portals configuration
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3eef1534c0dc3c6089f0d619d42784775fb1626e..28c502b5721bd150d9b9d2d84cb07c55af8373f1 100644
+index 64b746151368fbec60a706f1ad51a963d7a9193f..6b1088ff9f69314ed36a809bd9f04f548d5e9469 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2411,7 +2411,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,7 +17,7 @@ index 3eef1534c0dc3c6089f0d619d42784775fb1626e..28c502b5721bd150d9b9d2d84cb07c55
              if (!this.world.isClientSide && !blockposition.equals(this.ac)) {
                  this.ac = blockposition.immutableCopy();
              }
-@@ -2984,7 +2984,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2986,7 +2986,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean canPortal() {
diff --git a/patches/server/0135-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0135-Apply-display-names-from-item-forms-of-entities-to-e.patch
index f4c356ed6..dcc83d694 100644
--- a/patches/server/0135-Apply-display-names-from-item-forms-of-entities-to-e.patch
+++ b/patches/server/0135-Apply-display-names-from-item-forms-of-entities-to-e.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] Apply display names from item forms of entities to entities
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index df3fc83029ea9d06045a3f132f8e85b0c33b0649..a75de169feb7b10fe7860216303fbf3db7d535ba 100644
+index faa221038df6bed02a2433855ed7c7e0f89c6024..6efe59e0385e144c59804e9e5e18e6910b1f6667 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
-@@ -546,7 +546,13 @@ public class EntityArmorStand extends EntityLiving {
+@@ -553,7 +553,13 @@ public class EntityArmorStand extends EntityLiving {
      }
  
      private void f(DamageSource damagesource) {
diff --git a/patches/server/0140-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch b/patches/server/0140-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
index 2fbb4ab51..6874725e6 100644
--- a/patches/server/0140-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
+++ b/patches/server/0140-Add-critical-hit-check-to-EntityDamagedByEntityEvent.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Add critical hit check to EntityDamagedByEntityEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index deb6c93426e35c47fbe23dba71bd1712f4dba652..84e500fa7f3f22cfa344cfcc0fb8140057a6f112 100644
+index 9963cef9298eb6d3e2ee6a24d9b1998e765123ac..a72ce4ea5a45fce35a47fd5f9c21b9500adbe265 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -73,6 +73,7 @@ public abstract class EntityHuman extends EntityLiving {
diff --git a/patches/server/0154-Lobotomize-stuck-villagers.patch b/patches/server/0154-Lobotomize-stuck-villagers.patch
index 9bb50326b..9b9de7948 100644
--- a/patches/server/0154-Lobotomize-stuck-villagers.patch
+++ b/patches/server/0154-Lobotomize-stuck-villagers.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Lobotomize stuck villagers
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 28c502b5721bd150d9b9d2d84cb07c55af8373f1..98e8f8d7751ca7489c7cb4d41e4f628dec7b5c5d 100644
+index 6b1088ff9f69314ed36a809bd9f04f548d5e9469..12f2cf5fd76b4d05038e2c2a2757553863752a86 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -114,7 +114,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/patches/server/0158-Configurable-chance-for-wolves-to-spawn-rabid.patch b/patches/server/0158-Configurable-chance-for-wolves-to-spawn-rabid.patch
index b4c700fc2..443d233c6 100644
--- a/patches/server/0158-Configurable-chance-for-wolves-to-spawn-rabid.patch
+++ b/patches/server/0158-Configurable-chance-for-wolves-to-spawn-rabid.patch
@@ -7,10 +7,10 @@ Configurable chance to spawn a wolf that is rabid.
 Rabid wolves attack all players, mobs, and animals.
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index f730fa484b770eb41ce1fe4f7765b77866472798..e3ac6ebfd488e8ee94eb47c224e53f05eff9c563 100644
+index 29fdb7c682eda00e04431cecea57f2f395ac2cb3..9423e2e7975b1401fcc57506b733bf5034e7fe36 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2085,6 +2085,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2091,6 +2091,7 @@ public abstract class EntityLiving extends Entity {
          }
      }