diff --git a/.gitmodules b/.gitmodules
index 888303069..7b2390d2c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,4 +1,4 @@
 [submodule "Paper"]
         path = Paper
         url = https://github.com/PaperMC/Paper.git
-        branch = origin/master
+	branch = ver/1.16.5
diff --git a/Paper b/Paper
index e04368045..903fa9a33 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit e04368045e2fe8e53a7b686e9bfb7c41766267be
+Subproject commit 903fa9a33fcaab03e67343d010558c738bcea84e
diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch
index 149496770..41f6179d7 100644
--- a/patches/server/0001-Tuinity-Server-Changes.patch
+++ b/patches/server/0001-Tuinity-Server-Changes.patch
@@ -15410,7 +15410,7 @@ index dca2e9e45116df22d8c95d1be8f0a7e3c2d2b6b1..cb394ec310712cc97d65afe068284b27
  
                          try {
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6e1304f7169c11f67c573b2c8dc11825bcc7da0d..89852779fd9cfd19058afe40feb0cf14ca8d2896 100644
+index 0ec3589df774af366a896b8dc257f138e94e6e18..6c4d3aab0a9efcc039071e48d9b9596f1a222694 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -228,7 +228,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
@@ -15422,7 +15422,7 @@ index 6e1304f7169c11f67c573b2c8dc11825bcc7da0d..89852779fd9cfd19058afe40feb0cf14
      public boolean noclip;
      public float I;
      protected final Random random;
-@@ -299,6 +299,14 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -300,6 +300,14 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
      }
      // CraftBukkit end
  
@@ -15437,7 +15437,7 @@ index 6e1304f7169c11f67c573b2c8dc11825bcc7da0d..89852779fd9cfd19058afe40feb0cf14
      // Paper start - optimise entity tracking
      final org.spigotmc.TrackingRange.TrackingRangeType trackingRangeType = org.spigotmc.TrackingRange.getTrackingRangeType(this);
  
-@@ -309,8 +317,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -310,8 +318,21 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
      }
  
      public final com.destroystokyo.paper.util.misc.PooledLinkedHashSets.PooledObjectLinkedOpenHashSet<EntityPlayer> getPlayersInTrackRange() {
@@ -15461,7 +15461,7 @@ index 6e1304f7169c11f67c573b2c8dc11825bcc7da0d..89852779fd9cfd19058afe40feb0cf14
      }
      // Paper end - optimise entity tracking
  
-@@ -345,6 +366,41 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -346,6 +367,41 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
      }
      // Paper end - make end portalling safe
  
@@ -15503,7 +15503,7 @@ index 6e1304f7169c11f67c573b2c8dc11825bcc7da0d..89852779fd9cfd19058afe40feb0cf14
      public Entity(EntityTypes<?> entitytypes, World world) {
          this.id = Entity.entityCount.incrementAndGet();
          this.passengers = Lists.newArrayList();
-@@ -714,7 +770,39 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -715,7 +771,39 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return this.onGround;
      }
  
@@ -15543,7 +15543,7 @@ index 6e1304f7169c11f67c573b2c8dc11825bcc7da0d..89852779fd9cfd19058afe40feb0cf14
          if (this.noclip) {
              this.a(this.getBoundingBox().c(vec3d));
              this.recalcPosition();
-@@ -742,7 +830,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -743,7 +831,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
              // Paper end
  
              vec3d = this.a(vec3d, enummovetype);
@@ -15552,7 +15552,7 @@ index 6e1304f7169c11f67c573b2c8dc11825bcc7da0d..89852779fd9cfd19058afe40feb0cf14
  
              if (vec3d1.g() > 1.0E-7D) {
                  this.a(this.getBoundingBox().c(vec3d1));
-@@ -833,7 +921,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -834,7 +922,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
              }
  
              try {
@@ -15561,7 +15561,7 @@ index 6e1304f7169c11f67c573b2c8dc11825bcc7da0d..89852779fd9cfd19058afe40feb0cf14
              } catch (Throwable throwable) {
                  CrashReport crashreport = CrashReport.a(throwable, "Checking entity block collision");
                  CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being checked for collision");
-@@ -845,11 +933,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -846,11 +934,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
              float f2 = this.getBlockSpeedFactor();
  
              this.setMot(this.getMot().d((double) f2, 1.0D, (double) f2));
@@ -15574,7 +15574,7 @@ index 6e1304f7169c11f67c573b2c8dc11825bcc7da0d..89852779fd9cfd19058afe40feb0cf14
  
              if (this.aG() && this.isBurning()) {
                  this.playSound(SoundEffects.ENTITY_GENERIC_EXTINGUISH_FIRE, 0.7F, 1.6F + (this.random.nextFloat() - this.random.nextFloat()) * 0.4F);
-@@ -858,6 +942,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -859,6 +943,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
  
              this.world.getMethodProfiler().exit();
          }
@@ -15588,7 +15588,7 @@ index 6e1304f7169c11f67c573b2c8dc11825bcc7da0d..89852779fd9cfd19058afe40feb0cf14
      }
  
      protected BlockPosition ap() {
-@@ -938,6 +1029,137 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -939,6 +1030,137 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return d0;
      }
  
@@ -15726,7 +15726,7 @@ index 6e1304f7169c11f67c573b2c8dc11825bcc7da0d..89852779fd9cfd19058afe40feb0cf14
      private Vec3D g(Vec3D vec3d) {
          AxisAlignedBB axisalignedbb = this.getBoundingBox();
          VoxelShapeCollision voxelshapecollision = VoxelShapeCollision.a(this);
-@@ -973,6 +1195,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -974,6 +1196,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return vec3d1;
      }
  
@@ -15734,7 +15734,7 @@ index 6e1304f7169c11f67c573b2c8dc11825bcc7da0d..89852779fd9cfd19058afe40feb0cf14
      public static double c(Vec3D vec3d) {
          return vec3d.x * vec3d.x + vec3d.z * vec3d.z;
      }
-@@ -1085,18 +1308,34 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -1086,18 +1309,34 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
      }
  
      protected void checkBlockCollisions() {
@@ -15772,7 +15772,7 @@ index 6e1304f7169c11f67c573b2c8dc11825bcc7da0d..89852779fd9cfd19058afe40feb0cf14
                          try {
                              iblockdata.a(this.world, blockposition_mutableblockposition, this);
                              this.a(iblockdata);
-@@ -1110,6 +1349,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -1111,6 +1350,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
                      }
                  }
              }
@@ -15784,7 +15784,7 @@ index 6e1304f7169c11f67c573b2c8dc11825bcc7da0d..89852779fd9cfd19058afe40feb0cf14
          }
  
      }
-@@ -1481,6 +1725,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -1482,6 +1726,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return d3 * d3 + d4 * d4 + d5 * d5;
      }
  
@@ -15792,7 +15792,7 @@ index 6e1304f7169c11f67c573b2c8dc11825bcc7da0d..89852779fd9cfd19058afe40feb0cf14
      public double h(Entity entity) {
          return this.e(entity.getPositionVector());
      }
-@@ -2073,9 +2318,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2078,9 +2323,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
              float f1 = this.size.width * 0.8F;
              AxisAlignedBB axisalignedbb = AxisAlignedBB.g((double) f1, 0.10000000149011612D, (double) f1).d(this.locX(), this.getHeadY(), this.locZ());
  
@@ -15804,7 +15804,7 @@ index 6e1304f7169c11f67c573b2c8dc11825bcc7da0d..89852779fd9cfd19058afe40feb0cf14
          }
      }
  
-@@ -2083,11 +2328,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2088,11 +2333,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return EnumInteractionResult.PASS;
      }
  
@@ -15820,7 +15820,7 @@ index 6e1304f7169c11f67c573b2c8dc11825bcc7da0d..89852779fd9cfd19058afe40feb0cf14
          return false;
      }
  
-@@ -2979,7 +3226,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2984,7 +3231,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
              this.recursiveStream().forEach((entity) -> {
                  worldserver.chunkCheck(entity);
                  entity.az = true;
@@ -15829,7 +15829,7 @@ index 6e1304f7169c11f67c573b2c8dc11825bcc7da0d..89852779fd9cfd19058afe40feb0cf14
  
                  while (iterator.hasNext()) {
                      Entity entity1 = (Entity) iterator.next();
-@@ -3437,12 +3684,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -3442,12 +3689,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return this.locBlock;
      }
  
@@ -15846,7 +15846,7 @@ index 6e1304f7169c11f67c573b2c8dc11825bcc7da0d..89852779fd9cfd19058afe40feb0cf14
      }
  
      public void setMot(double d0, double d1, double d2) {
-@@ -3497,7 +3748,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -3502,7 +3753,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          }
          // Paper end
          if (this.loc.x != d0 || this.loc.y != d1 || this.loc.z != d2) {
diff --git a/patches/server/0025-Giants-AI-settings.patch b/patches/server/0025-Giants-AI-settings.patch
index afa44eae1..3a4e259d8 100644
--- a/patches/server/0025-Giants-AI-settings.patch
+++ b/patches/server/0025-Giants-AI-settings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Giants AI settings
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 89852779fd9cfd19058afe40feb0cf14ca8d2896..611a2c34c80462826564705eb5a079bd6fdda4e1 100644
+index 6c4d3aab0a9efcc039071e48d9b9596f1a222694..1b773fa6c2ff30ca3463c88ccc28c360e15f3fdb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -228,7 +228,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
diff --git a/patches/server/0039-Cows-eat-mushrooms.patch b/patches/server/0039-Cows-eat-mushrooms.patch
index bafcfc319..333300409 100644
--- a/patches/server/0039-Cows-eat-mushrooms.patch
+++ b/patches/server/0039-Cows-eat-mushrooms.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Cows eat mushrooms
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 611a2c34c80462826564705eb5a079bd6fdda4e1..0f11984743ba49fc6f094c8fa6c563febf0ab7d6 100644
+index 1b773fa6c2ff30ca3463c88ccc28c360e15f3fdb..8a76585542d77a85d3203190ec64f14bbf4758d8 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2920,6 +2920,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2925,6 +2925,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          this.invulnerable = flag;
      }
  
diff --git a/patches/server/0052-Fix-the-dead-lagging-the-server.patch b/patches/server/0052-Fix-the-dead-lagging-the-server.patch
index a5ef06001..5ab49d991 100644
--- a/patches/server/0052-Fix-the-dead-lagging-the-server.patch
+++ b/patches/server/0052-Fix-the-dead-lagging-the-server.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Fix the dead lagging the server
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 0f11984743ba49fc6f094c8fa6c563febf0ab7d6..e458be6377595efed8dfb6527ab0b7a0f0f87d84 100644
+index 8a76585542d77a85d3203190ec64f14bbf4758d8..cfedb980d05034a833a4c80c5cf892877ee6fe4f 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1659,6 +1659,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -1660,6 +1660,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          this.pitch = MathHelper.a(f1, -90.0F, 90.0F) % 360.0F;
          this.lastYaw = this.yaw;
          this.lastPitch = this.pitch;
diff --git a/patches/server/0067-Add-canSaveToDisk-to-Entity.patch b/patches/server/0067-Add-canSaveToDisk-to-Entity.patch
index 83c0fc8f9..a125d9d72 100644
--- a/patches/server/0067-Add-canSaveToDisk-to-Entity.patch
+++ b/patches/server/0067-Add-canSaveToDisk-to-Entity.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add canSaveToDisk to Entity
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e458be6377595efed8dfb6527ab0b7a0f0f87d84..cfe6a52fa45c8dfcb2136978456b6abf7a32258c 100644
+index cfedb980d05034a833a4c80c5cf892877ee6fe4f..b9714c013dc72c14aba121efaa03a68e24fb297a 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -444,6 +444,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -445,6 +445,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          this.headHeight = this.getHeadHeight(EntityPose.STANDING, this.size);
      }
  
diff --git a/patches/server/0068-Configurable-void-damage-height-and-damage.patch b/patches/server/0068-Configurable-void-damage-height-and-damage.patch
index ff2178259..de21d1b18 100644
--- a/patches/server/0068-Configurable-void-damage-height-and-damage.patch
+++ b/patches/server/0068-Configurable-void-damage-height-and-damage.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable void damage height and damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index cfe6a52fa45c8dfcb2136978456b6abf7a32258c..b3618e2100404d1b13d2930d463b8e283ea62f64 100644
+index b9714c013dc72c14aba121efaa03a68e24fb297a..77db32a0ae6181f1c83c5a5086d2911eff77ec74 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -747,7 +747,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -748,7 +748,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
  
      // Paper start
      protected void performVoidDamage() {
diff --git a/patches/server/0075-Item-entity-immunities.patch b/patches/server/0075-Item-entity-immunities.patch
index 7296829ac..2d6cd4243 100644
--- a/patches/server/0075-Item-entity-immunities.patch
+++ b/patches/server/0075-Item-entity-immunities.patch
@@ -31,10 +31,10 @@ index d827e18d8c3b9b5869dbb1e233f415ba0efb7c1b..d876c5037b4704a174606629c80ba114
          private final int trackingDistance;
          private SectionPosition e;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b3618e2100404d1b13d2930d463b8e283ea62f64..d5882cac0dd43cea6e7184487e6d25fa34ebafc2 100644
+index 77db32a0ae6181f1c83c5a5086d2911eff77ec74..679d7173e919c8f72975bf083ba936ad1fe8a650 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1608,6 +1608,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -1609,6 +1609,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
  
      }
  
diff --git a/patches/server/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
index 7936c330f..89ed49231 100644
--- a/patches/server/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
+++ b/patches/server/0078-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Phantoms attracted to crystals and crystals shoot phantoms
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index d5882cac0dd43cea6e7184487e6d25fa34ebafc2..6dc051e0da0a97bcd9e4cba94c2cabc411ebb86f 100644
+index 679d7173e919c8f72975bf083ba936ad1fe8a650..2ec2ae864bfa159fa585b4787cb75af9704c78eb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2279,8 +2279,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2284,8 +2284,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return this.a(new ItemStack(imaterial), (float) i);
      }
  
diff --git a/patches/server/0101-Stop-squids-floating-on-top-of-water.patch b/patches/server/0101-Stop-squids-floating-on-top-of-water.patch
index b9dc85443..bde3fff9f 100644
--- a/patches/server/0101-Stop-squids-floating-on-top-of-water.patch
+++ b/patches/server/0101-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/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6dc051e0da0a97bcd9e4cba94c2cabc411ebb86f..fdb7f1b582b791a938451b90914b621347a48189 100644
+index 2ec2ae864bfa159fa585b4787cb75af9704c78eb..93f66d74f2aabc6d7df92bf50847080737ba0a75 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -3590,8 +3590,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -3595,8 +3595,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          this.lastYaw = this.yaw;
      }
  
diff --git a/patches/server/0102-Ridables.patch b/patches/server/0102-Ridables.patch
index 2d836595f..93f927855 100644
--- a/patches/server/0102-Ridables.patch
+++ b/patches/server/0102-Ridables.patch
@@ -149,7 +149,7 @@ index e6bf78f46acc37d9515d58cec3587e236ac0733c..5842d23a536449d0c394c7b23ee0cef3
          this.B = true;
          return this;
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index fdb7f1b582b791a938451b90914b621347a48189..6d17a5f75e073acccabbad65b998b4eb9e8cf400 100644
+index 93f66d74f2aabc6d7df92bf50847080737ba0a75..618f8735fe16f0490a321c447536c2558fcb67e3 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -22,6 +22,7 @@ import net.minecraft.BlockUtil;
@@ -195,7 +195,7 @@ index fdb7f1b582b791a938451b90914b621347a48189..6d17a5f75e073acccabbad65b998b4eb
      private float headHeight;
      // CraftBukkit start
      public boolean persist = true;
-@@ -1618,6 +1618,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -1619,6 +1619,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return !this.justCreated && this.M.getDouble(TagsFluid.LAVA) > 0.0D;
      }
  
@@ -203,7 +203,7 @@ index fdb7f1b582b791a938451b90914b621347a48189..6d17a5f75e073acccabbad65b998b4eb
      public void a(float f, Vec3D vec3d) {
          Vec3D vec3d1 = a(vec3d, f, this.yaw);
  
-@@ -2379,6 +2380,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2384,6 +2385,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return this.a(entity, false);
      }
  
@@ -211,7 +211,7 @@ index fdb7f1b582b791a938451b90914b621347a48189..6d17a5f75e073acccabbad65b998b4eb
      public boolean a(Entity entity, boolean flag) {
          for (Entity entity1 = entity; entity1.vehicle != null; entity1 = entity1.vehicle) {
              if (entity1.vehicle == this) {
-@@ -2474,6 +2476,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2479,6 +2481,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
                  this.passengers.add(entity);
              }
  
@@ -225,7 +225,7 @@ index fdb7f1b582b791a938451b90914b621347a48189..6d17a5f75e073acccabbad65b998b4eb
          }
          return true; // CraftBukkit
      }
-@@ -2514,6 +2523,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2519,6 +2528,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
                  return false;
              }
              // Spigot end
@@ -238,7 +238,7 @@ index fdb7f1b582b791a938451b90914b621347a48189..6d17a5f75e073acccabbad65b998b4eb
              this.passengers.remove(entity);
              entity.j = 60;
          }
-@@ -2680,6 +2695,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2685,6 +2700,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          this.setFlag(4, flag);
      }
  
@@ -246,7 +246,7 @@ index fdb7f1b582b791a938451b90914b621347a48189..6d17a5f75e073acccabbad65b998b4eb
      public boolean bE() {
          return this.glowing || this.world.isClientSide && this.getFlag(6);
      }
-@@ -2902,6 +2918,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2907,6 +2923,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
  
      public void setHeadRotation(float f) {}
  
@@ -254,7 +254,7 @@ index fdb7f1b582b791a938451b90914b621347a48189..6d17a5f75e073acccabbad65b998b4eb
      public void n(float f) {}
  
      public boolean bL() {
-@@ -3343,6 +3360,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -3348,6 +3365,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return false;
      }
  
@@ -273,7 +273,7 @@ index fdb7f1b582b791a938451b90914b621347a48189..6d17a5f75e073acccabbad65b998b4eb
      @Override
      public void sendMessage(IChatBaseComponent ichatbasecomponent, UUID uuid) {}
  
-@@ -3795,4 +3824,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -3800,4 +3829,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return ((ChunkProviderServer) world.getChunkProvider()).isInEntityTickingChunk(this);
      }
      // Paper end
diff --git a/patches/server/0105-Entities-can-use-portals-configuration.patch b/patches/server/0105-Entities-can-use-portals-configuration.patch
index 7259c7a25..29fd3bbec 100644
--- a/patches/server/0105-Entities-can-use-portals-configuration.patch
+++ b/patches/server/0105-Entities-can-use-portals-configuration.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Entities can use portals configuration
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6d17a5f75e073acccabbad65b998b4eb9e8cf400..e2de4d53e90b30f46a477c995505ac9f48cac842 100644
+index 618f8735fe16f0490a321c447536c2558fcb67e3..45995a49dc7d441e82c1fbd043bf6249c16843bb 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2555,7 +2555,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2560,7 +2560,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
      public void d(BlockPosition blockposition) {
          if (this.ai()) {
              this.resetPortalCooldown();
@@ -17,7 +17,7 @@ index 6d17a5f75e073acccabbad65b998b4eb9e8cf400..e2de4d53e90b30f46a477c995505ac9f
              if (!this.world.isClientSide && !blockposition.equals(this.ac)) {
                  this.ac = blockposition.immutableCopy();
              }
-@@ -3136,7 +3136,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -3141,7 +3141,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
      }
  
      public boolean canPortal() {
diff --git a/patches/server/0116-Stonecutter-damage.patch b/patches/server/0116-Stonecutter-damage.patch
index 574daef97..9b8901d96 100644
--- a/patches/server/0116-Stonecutter-damage.patch
+++ b/patches/server/0116-Stonecutter-damage.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Stonecutter damage
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index e2de4d53e90b30f46a477c995505ac9f48cac842..b15f117d64d4e6a1dccdda480417b6f092c161ec 100644
+index 45995a49dc7d441e82c1fbd043bf6249c16843bb..1b29b059307b2ec5904b348e5d625ea063b6137c 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -890,7 +890,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -891,7 +891,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
              }
              // CraftBukkit end
  
diff --git a/patches/server/0140-PaperPR-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0140-PaperPR-Config-option-for-Piglins-guarding-chests.patch
index b9c2801a5..117070993 100644
--- a/patches/server/0140-PaperPR-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0140-PaperPR-Config-option-for-Piglins-guarding-chests.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] PaperPR - Config option for Piglins guarding chests
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fcacc08db8f5a58ddd06be7f9f2cb2cf6b2231c3..03c26e4dfb4775bfd9caa4f155bde58e83865388 100644
+index 32ac923d41d89ae170924532245bde9975bcfbd3..91602ad142e1bd51247d9b36d24d8568aeeef582 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -719,6 +719,11 @@ public class PaperWorldConfig {
diff --git a/patches/server/0143-Lobotomize-stuck-villagers.patch b/patches/server/0143-Lobotomize-stuck-villagers.patch
index dcb81572b..dd14e78d4 100644
--- a/patches/server/0143-Lobotomize-stuck-villagers.patch
+++ b/patches/server/0143-Lobotomize-stuck-villagers.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Lobotomize stuck villagers
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index b15f117d64d4e6a1dccdda480417b6f092c161ec..ca5afdcc9c5ae7b5f67a2c12f62e89ef5e227e3c 100644
+index 1b29b059307b2ec5904b348e5d625ea063b6137c..d545b1860d8e1aa0016f1aad1584acbaab17ce02 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
 @@ -206,7 +206,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
diff --git a/patches/server/0163-Movement-options-for-armor-stands.patch b/patches/server/0163-Movement-options-for-armor-stands.patch
index 8e9302cb6..ab3fae264 100644
--- a/patches/server/0163-Movement-options-for-armor-stands.patch
+++ b/patches/server/0163-Movement-options-for-armor-stands.patch
@@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <https://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 ca5afdcc9c5ae7b5f67a2c12f62e89ef5e227e3c..6c5c950b129b5e7e7d0d614cfdbfb5c59fda86de 100644
+index d545b1860d8e1aa0016f1aad1584acbaab17ce02..7d969c5f798e1b826ee5244245a6184d6dafd471 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1496,7 +1496,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -1497,7 +1497,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return this.isInWater() || flag;
      }
  
diff --git a/patches/server/0164-Fix-stuck-in-portals.patch b/patches/server/0164-Fix-stuck-in-portals.patch
index d790d2323..b02a5925d 100644
--- a/patches/server/0164-Fix-stuck-in-portals.patch
+++ b/patches/server/0164-Fix-stuck-in-portals.patch
@@ -17,10 +17,10 @@ index c631e4d27518a1382869c184af41bec911cce908..2bae88b7b53d38f41808fe0177cd78a9
                  // CraftBukkit end
                  this.spawnIn(worldserver);
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 6c5c950b129b5e7e7d0d614cfdbfb5c59fda86de..27cd04a4b6e0c87a300f5868f0b82fc02408a556 100644
+index 7d969c5f798e1b826ee5244245a6184d6dafd471..0a22cf78940e5257af6a924ef8c3c163add06c68 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2552,12 +2552,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2557,12 +2557,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          return new Vec2F(this.pitch, this.yaw);
      }
  
diff --git a/patches/server/0171-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch b/patches/server/0171-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
index f65fab7a3..b332ce519 100644
--- a/patches/server/0171-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
+++ b/patches/server/0171-Configs-for-if-Wither-Ender-Dragon-can-ride-vehicles.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configs for if Wither/Ender Dragon can ride vehicles
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 27cd04a4b6e0c87a300f5868f0b82fc02408a556..11924a84fd597da38e70aa0ab29c07e60ed8453a 100644
+index 0a22cf78940e5257af6a924ef8c3c163add06c68..71b694449c5605db6ff140f139b1feb1ec48bf80 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2402,7 +2402,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2407,7 +2407,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          }
      }
  
diff --git a/patches/server/0187-Drowning-Settings.patch b/patches/server/0187-Drowning-Settings.patch
index c3232fa2d..10b0b30fe 100644
--- a/patches/server/0187-Drowning-Settings.patch
+++ b/patches/server/0187-Drowning-Settings.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Drowning Settings
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 11924a84fd597da38e70aa0ab29c07e60ed8453a..778c5ee222d51e35bac51bba42f336780fd153dc 100644
+index 71b694449c5605db6ff140f139b1feb1ec48bf80..d45a1c7a36194159ad58e113d604169a06015b81 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2608,7 +2608,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2613,7 +2613,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
      }
  
      public int getDefaultPortalCooldown() {
diff --git a/patches/server/0198-Configurable-damage-settings-for-magma-blocks.patch b/patches/server/0198-Configurable-damage-settings-for-magma-blocks.patch
index 39e34dd6c..c03f4d99c 100644
--- a/patches/server/0198-Configurable-damage-settings-for-magma-blocks.patch
+++ b/patches/server/0198-Configurable-damage-settings-for-magma-blocks.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Configurable damage settings for magma blocks
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 778c5ee222d51e35bac51bba42f336780fd153dc..dcb8cff2671947140f5853b1f6d75ecc03ef368f 100644
+index d45a1c7a36194159ad58e113d604169a06015b81..e896b459e07478757f1d2f1d4228af9f5c79d6d6 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -890,7 +890,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -891,7 +891,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
              }
              // CraftBukkit end
  
diff --git a/patches/server/0219-API-for-any-mob-to-burn-daylight.patch b/patches/server/0219-API-for-any-mob-to-burn-daylight.patch
index 008a44bad..2ddc997ba 100644
--- a/patches/server/0219-API-for-any-mob-to-burn-daylight.patch
+++ b/patches/server/0219-API-for-any-mob-to-burn-daylight.patch
@@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight
 Co-authored by: Encode42 <me@encode42.dev>
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index dcb8cff2671947140f5853b1f6d75ecc03ef368f..35c15afc3f4bbe10dc7638e926564f51285fda4c 100644
+index e896b459e07478757f1d2f1d4228af9f5c79d6d6..139c69f92addd4f886e09997e4a77f445528a588 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -1639,7 +1639,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -1640,7 +1640,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
          }
      }
  
@@ -18,7 +18,7 @@ index dcb8cff2671947140f5853b1f6d75ecc03ef368f..35c15afc3f4bbe10dc7638e926564f51
          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition(this.locX(), 0.0D, this.locZ());
  
          if (this.world.isLoaded(blockposition_mutableblockposition)) {
-@@ -3869,5 +3869,17 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -3874,5 +3874,17 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
      public boolean processClick(EnumHand hand) {
          return false;
      }
diff --git a/patches/server/0224-Add-toggle-for-end-portal-safe-teleporting.patch b/patches/server/0224-Add-toggle-for-end-portal-safe-teleporting.patch
index 6eab623ed..8d1b36788 100644
--- a/patches/server/0224-Add-toggle-for-end-portal-safe-teleporting.patch
+++ b/patches/server/0224-Add-toggle-for-end-portal-safe-teleporting.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add toggle for end portal safe teleporting
 
 
 diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
-index 35c15afc3f4bbe10dc7638e926564f51285fda4c..18e5110047f13c213e70d3e094b94fecb4408d18 100644
+index 139c69f92addd4f886e09997e4a77f445528a588..2815a7fb9d8640ec7e0ff3b54e189a7657e4b6d9 100644
 --- a/src/main/java/net/minecraft/world/entity/Entity.java
 +++ b/src/main/java/net/minecraft/world/entity/Entity.java
-@@ -2603,7 +2603,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
+@@ -2608,7 +2608,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, ne
              }
  
              this.E();