diff --git a/Paper b/Paper
index ce8922b1d..3148b25b1 160000
--- a/Paper
+++ b/Paper
@@ -1 +1 @@
-Subproject commit ce8922b1d5aa963259695806a94f76a942135763
+Subproject commit 3148b25b1c9e33b9818f0fb82a4967a67b428ac0
diff --git a/patches/server/0001-Tuinity-Server-Changes.patch b/patches/server/0001-Tuinity-Server-Changes.patch
index a598dc350..bd07ffd37 100644
--- a/patches/server/0001-Tuinity-Server-Changes.patch
+++ b/patches/server/0001-Tuinity-Server-Changes.patch
@@ -575,10 +575,10 @@ index dee00aac05f1acf050f05d4db557a08dd0f301c8..52c0ab1ce46e1f3233ef746d9bc69935
                  metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> {
                      Map<String, Map<String, Integer>> map = new HashMap<>();
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index 196648e65c6f58c18e19623474d69d780d542689..57863d913c67750cdd794a65513f3daf93580c52 100644
+index 0abfe19e204d20af0f8dedbeedb0ef98dfe9d3c8..1a876336384198bad2a25c018be5f2418027dd47 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-@@ -182,6 +182,44 @@ public class PaperCommand extends Command {
+@@ -186,6 +186,44 @@ public class PaperCommand extends Command {
          }
      }
  
@@ -623,7 +623,7 @@ index 196648e65c6f58c18e19623474d69d780d542689..57863d913c67750cdd794a65513f3daf
      private void doFixLight(CommandSender sender, String[] args) {
          if (!(sender instanceof Player)) {
              sender.sendMessage("Only players can use this command");
-@@ -190,7 +228,7 @@ public class PaperCommand extends Command {
+@@ -194,7 +232,7 @@ public class PaperCommand extends Command {
          int radius = 2;
          if (args.length > 1) {
              try {
@@ -632,7 +632,7 @@ index 196648e65c6f58c18e19623474d69d780d542689..57863d913c67750cdd794a65513f3daf
              } catch (Exception e) {
                  sender.sendMessage("Not a number");
                  return;
-@@ -203,6 +241,13 @@ public class PaperCommand extends Command {
+@@ -207,6 +245,13 @@ public class PaperCommand extends Command {
          net.minecraft.server.WorldServer world = (WorldServer) handle.world;
          LightEngineThreaded lightengine = world.getChunkProvider().getLightEngine();
  
@@ -9634,7 +9634,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 d9021fde3d0908dc89384617055874ac356a8fcf..d43a843be591da1b34b37dc95d7d82549d9f56f4 100644
+index 36fbe16e6f06fca3eb282cce5b8c5fcc87a0166d..259ee6dd50c0782b1d137cadba878e7c209f3329 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
@@ -10029,7 +10029,7 @@ index d9021fde3d0908dc89384617055874ac356a8fcf..d43a843be591da1b34b37dc95d7d8254
          return false;
      }
  
-@@ -2843,7 +3086,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2849,7 +3092,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              this.cp().forEach((entity) -> {
                  worldserver.chunkCheck(entity);
                  entity.az = true;
@@ -10038,7 +10038,7 @@ index d9021fde3d0908dc89384617055874ac356a8fcf..d43a843be591da1b34b37dc95d7d8254
  
                  while (iterator.hasNext()) {
                      Entity entity1 = (Entity) iterator.next();
-@@ -3301,12 +3544,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3307,12 +3550,16 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.locBlock;
      }
  
@@ -10055,7 +10055,7 @@ index d9021fde3d0908dc89384617055874ac356a8fcf..d43a843be591da1b34b37dc95d7d8254
      }
  
      public void setMot(double d0, double d1, double d2) {
-@@ -3361,7 +3608,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3367,7 +3614,9 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          }
          // Paper end
          if (this.loc.x != d0 || this.loc.y != d1 || this.loc.z != d2) {
@@ -15191,7 +15191,7 @@ index 5d9d58411f2fad9d5da703f964d269b4a7c2b205..f0fdfd6891e59891e7370a2d682b65c6
          private double c;
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 17fdfb11e844a53af6a4df4f5f66f24667cdd862..cd67ca19436f791f871fd2bf4c258b6342fb554e 100644
+index 02303f00e243748b9d1c4a37719fcf5c8d271ed9..28ee325fcc8b50397768363403823f2e3391d8c8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -94,6 +94,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -15267,7 +15267,7 @@ index 17fdfb11e844a53af6a4df4f5f66f24667cdd862..cd67ca19436f791f871fd2bf4c258b63
          // CraftBukkit start - tree generation
          if (this.captureTreeGeneration) {
              // Paper start
-@@ -460,6 +501,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -461,6 +502,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
  
      // CraftBukkit start - Split off from above in order to directly send client and physic updates
      public void notifyAndUpdatePhysics(BlockPosition blockposition, Chunk chunk, IBlockData oldBlock, IBlockData newBlock, IBlockData actualBlock, int i, int j) {
@@ -15275,7 +15275,7 @@ index 17fdfb11e844a53af6a4df4f5f66f24667cdd862..cd67ca19436f791f871fd2bf4c258b63
          IBlockData iblockdata = newBlock;
          IBlockData iblockdata1 = oldBlock;
          IBlockData iblockdata2 = actualBlock;
-@@ -895,6 +937,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -896,6 +938,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
              return;
              // Paper end
          }
@@ -15283,7 +15283,7 @@ index 17fdfb11e844a53af6a4df4f5f66f24667cdd862..cd67ca19436f791f871fd2bf4c258b63
      }
      // Paper start - Prevent armor stands from doing entity lookups
      @Override
-@@ -1078,10 +1121,44 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1079,10 +1122,44 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          return this.getChunkAt(i, j, ChunkStatus.FULL, false);
      }
  
@@ -15329,7 +15329,7 @@ index 17fdfb11e844a53af6a4df4f5f66f24667cdd862..cd67ca19436f791f871fd2bf4c258b63
          int i = MathHelper.floor((axisalignedbb.minX - 2.0D) / 16.0D);
          int j = MathHelper.floor((axisalignedbb.maxX + 2.0D) / 16.0D);
          int k = MathHelper.floor((axisalignedbb.minZ - 2.0D) / 16.0D);
-@@ -1137,7 +1214,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1138,7 +1215,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
                  Chunk chunk = (Chunk)this.getChunkIfLoadedImmediately(i1, j1); // Paper
  
                  if (chunk != null) {
@@ -15338,7 +15338,7 @@ index 17fdfb11e844a53af6a4df4f5f66f24667cdd862..cd67ca19436f791f871fd2bf4c258b63
                  }
              }
          }
-@@ -1160,7 +1237,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1161,7 +1238,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
                  Chunk chunk = (Chunk)this.getChunkIfLoadedImmediately(i1, j1); // Paper
  
                  if (chunk != null) {
@@ -15347,7 +15347,7 @@ index 17fdfb11e844a53af6a4df4f5f66f24667cdd862..cd67ca19436f791f871fd2bf4c258b63
                  }
              }
          }
-@@ -1168,6 +1245,106 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1169,6 +1246,106 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          return list;
      }
  
diff --git a/patches/server/0003-Purpur-config-files.patch b/patches/server/0003-Purpur-config-files.patch
index a42b3ff2a..afc18eb4f 100644
--- a/patches/server/0003-Purpur-config-files.patch
+++ b/patches/server/0003-Purpur-config-files.patch
@@ -78,7 +78,7 @@ index 9b35c8ad9efe9241fe442bc6ef2e9f62def386d8..2c4c13b30b4533f5476f1128317d477a
          if (this.bF) {
              this.bF = false;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index cd67ca19436f791f871fd2bf4c258b6342fb554e..07f30b9037cf983b18f31bc5fc10328928d75aee 100644
+index 28ee325fcc8b50397768363403823f2e3391d8c8..fb650c09dbcefa0ff021f7c508ff6811a48bee7a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -95,6 +95,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
diff --git a/patches/server/0027-Giants-AI-settings.patch b/patches/server/0027-Giants-AI-settings.patch
index 1416ce06a..dd6135ad7 100644
--- a/patches/server/0027-Giants-AI-settings.patch
+++ b/patches/server/0027-Giants-AI-settings.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Giants AI settings
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d43a843be591da1b34b37dc95d7d82549d9f56f4..8e2bc7237463647b41e6451deb1679380a5b33f1 100644
+index 259ee6dd50c0782b1d137cadba878e7c209f3329..7c5977b074a4dbce982b5979d6d8d3422baa6655 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
diff --git a/patches/server/0041-Cows-eat-mushrooms.patch b/patches/server/0041-Cows-eat-mushrooms.patch
index f194c7cec..37c7eed3d 100644
--- a/patches/server/0041-Cows-eat-mushrooms.patch
+++ b/patches/server/0041-Cows-eat-mushrooms.patch
@@ -5,7 +5,7 @@ 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 8e2bc7237463647b41e6451deb1679380a5b33f1..3d1c3232632e49ae2d7a22c9a48545540200efa0 100644
+index 7c5977b074a4dbce982b5979d6d8d3422baa6655..846ed3cf74aac48ee8db8d364ef0a002980e355f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2786,6 +2786,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/patches/server/0055-Fix-the-dead-lagging-the-server.patch b/patches/server/0055-Fix-the-dead-lagging-the-server.patch
index 6ba6547f0..0ad72a4f0 100644
--- a/patches/server/0055-Fix-the-dead-lagging-the-server.patch
+++ b/patches/server/0055-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 3d1c3232632e49ae2d7a22c9a48545540200efa0..cbdfc8d929f9419d49b0642e8cfc7219741e0e38 100644
+index 846ed3cf74aac48ee8db8d364ef0a002980e355f..1210b1d2ac1b129342d80c2a47cd79e1c21be2a5 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1532,6 +1532,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/patches/server/0070-PaperPR-Projectile-load-save-limit-per-chunk.patch b/patches/server/0070-PaperPR-Projectile-load-save-limit-per-chunk.patch
index c0167429f..c19eac581 100644
--- a/patches/server/0070-PaperPR-Projectile-load-save-limit-per-chunk.patch
+++ b/patches/server/0070-PaperPR-Projectile-load-save-limit-per-chunk.patch
@@ -9,10 +9,10 @@ that 5 arrows, 5 snowballs, 5 tridents, etc. will be allowed to be
 saved/loaded per chunk. The default value of -1 disables the limit.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c46d5d6aa8246f0cecacba288ab3f51a41e112c8..5b2077c90e2a3010a6a596d7e3551e791e670d16 100644
+index c5495e02c3fe271b26f62ea2ec64e07957edf37e..0ba5734e60467e34c73d4ed92f5a030af9817582 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -759,4 +759,9 @@ public class PaperWorldConfig {
+@@ -761,4 +761,9 @@ public class PaperWorldConfig {
              EnumDifficulty.class
          );
      }
diff --git a/patches/server/0071-Add-canSaveToDisk-to-Entity.patch b/patches/server/0071-Add-canSaveToDisk-to-Entity.patch
index d457452ed..aac9cf444 100644
--- a/patches/server/0071-Add-canSaveToDisk-to-Entity.patch
+++ b/patches/server/0071-Add-canSaveToDisk-to-Entity.patch
@@ -17,7 +17,7 @@ index d5c0b5574f763c7191b03ff0e78e689dad6589ff..74056592041580fd747efe874f8931fb
                          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 cbdfc8d929f9419d49b0642e8cfc7219741e0e38..85f7c97136195bd7c77685244e89ceedec72dee5 100644
+index 1210b1d2ac1b129342d80c2a47cd79e1c21be2a5..79f418054f91184b73759296cef15beb410edeae 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/0072-Configurable-void-damage-height.patch b/patches/server/0072-Configurable-void-damage-height.patch
index a51708221..e4d9a6d1b 100644
--- a/patches/server/0072-Configurable-void-damage-height.patch
+++ b/patches/server/0072-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 85f7c97136195bd7c77685244e89ceedec72dee5..2e6b621694c4bbaeb2d7e3e2773bacda8374aa0d 100644
+index 79f418054f91184b73759296cef15beb410edeae..982b00049149bba1c49bb2a0ecaed38ad4c4a267 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/0075-Add-obfhelpers-for-plugin-use.patch b/patches/server/0075-Add-obfhelpers-for-plugin-use.patch
index a4f65c220..61bd86ce4 100644
--- a/patches/server/0075-Add-obfhelpers-for-plugin-use.patch
+++ b/patches/server/0075-Add-obfhelpers-for-plugin-use.patch
@@ -5,10 +5,10 @@ Subject: [PATCH] Add obfhelpers for plugin use
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 5a62ac72edc49cd032cd02fa8d007959517d063b..fcdb82a4e54810a7da9f5d4e6a0d975c23a24884 100644
+index 3adb29f004d2fee36f3ee9b21ee5417e84b64837..8c3d78f1ac30463b6592aaf65157e579f9ac87a3 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -644,6 +644,7 @@ public final class ItemStack {
+@@ -639,6 +639,7 @@ public final class ItemStack {
          return this.tag;
      }
  
diff --git a/patches/server/0076-Mending-mends-most-damages-equipment-first.patch b/patches/server/0076-Mending-mends-most-damages-equipment-first.patch
index 464cfb016..564fffbf5 100644
--- a/patches/server/0076-Mending-mends-most-damages-equipment-first.patch
+++ b/patches/server/0076-Mending-mends-most-damages-equipment-first.patch
@@ -54,10 +54,10 @@ index c2be0c2bc315876f120cff207e5516dda2bd55d7..358d6d660581686a2e8d49e13e8c2ade
                  if (entry != null) {
                      ItemStack itemstack = (ItemStack) entry.getValue();
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index fcdb82a4e54810a7da9f5d4e6a0d975c23a24884..0d011a1aae667f473f1ad2ec60d8506cd32dff6d 100644
+index 8c3d78f1ac30463b6592aaf65157e579f9ac87a3..c7931ff47498ba75b2cb29abccc6851e36109ce2 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -418,10 +418,19 @@ public final class ItemStack {
+@@ -413,10 +413,19 @@ public final class ItemStack {
          }
      }
  
diff --git a/patches/server/0078-Implement-elytra-settings.patch b/patches/server/0078-Implement-elytra-settings.patch
index 64ddd3046..13f772c2a 100644
--- a/patches/server/0078-Implement-elytra-settings.patch
+++ b/patches/server/0078-Implement-elytra-settings.patch
@@ -46,10 +46,10 @@ index e775fe69ee7e555721bc73e7cb0dd3136736bc9c..990eb656699d9ead26b42fbb305530b7
                          itemstack.subtract(1);
                      } else ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory();
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 0d011a1aae667f473f1ad2ec60d8506cd32dff6d..623bcb93cbdf0f67ee999104936f9d60c5228037 100644
+index c7931ff47498ba75b2cb29abccc6851e36109ce2..f5802f14b84a5b177ddbdb53a6c3ce892ef310f6 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -450,7 +450,7 @@ public final class ItemStack {
+@@ -445,7 +445,7 @@ public final class ItemStack {
              int j;
  
              if (i > 0) {
@@ -58,7 +58,7 @@ index 0d011a1aae667f473f1ad2ec60d8506cd32dff6d..623bcb93cbdf0f67ee999104936f9d60
                  int k = 0;
  
                  for (int l = 0; j > 0 && l < i; ++l) {
-@@ -496,6 +496,12 @@ public final class ItemStack {
+@@ -491,6 +491,12 @@ public final class ItemStack {
                  if (this.isDamaged(i, t0.getRandom(), t0 instanceof EntityPlayer ? (EntityPlayer) t0 : null)) {
                      consumer.accept(t0);
                      Item item = this.getItem();
diff --git a/patches/server/0079-Item-entity-immunities.patch b/patches/server/0079-Item-entity-immunities.patch
index b8d9bdbe3..34494819b 100644
--- a/patches/server/0079-Item-entity-immunities.patch
+++ b/patches/server/0079-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 2e6b621694c4bbaeb2d7e3e2773bacda8374aa0d..308cb9cfb418e63f17f8f39c3db94f93d874763f 100644
+index 982b00049149bba1c49bb2a0ecaed38ad4c4a267..929b909f05fa226ea3305671a7932475c8ce1837 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1481,6 +1481,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/patches/server/0082-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch b/patches/server/0082-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
index d9eb6c7a0..eea6ed06d 100644
--- a/patches/server/0082-Phantoms-attracted-to-crystals-and-crystals-shoot-ph.patch
+++ b/patches/server/0082-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 308cb9cfb418e63f17f8f39c3db94f93d874763f..d542cd8014a929b421e631075f1ee14423e9b66a 100644
+index 929b909f05fa226ea3305671a7932475c8ce1837..36e92f884ea5af69798c9b305b7aaf021da4bf04 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2146,8 +2146,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
diff --git a/patches/server/0083-Add-phantom-spawning-options.patch b/patches/server/0083-Add-phantom-spawning-options.patch
index 3aaa4016f..5e64a1147 100644
--- a/patches/server/0083-Add-phantom-spawning-options.patch
+++ b/patches/server/0083-Add-phantom-spawning-options.patch
@@ -233,10 +233,10 @@ index 661ad8f8e67046211e001ea40d97660d7c88f8e5..ee91c33a7a2edca02caf5c71fd6429f9
          return iblockdata.r(iblockaccess, blockposition) ? false : (iblockdata.isPowerSource() ? false : (!fluid.isEmpty() ? false : (iblockdata.a((Tag) TagsBlock.PREVENT_MOB_SPAWNING_INSIDE) ? false : !entitytypes.a(iblockdata))));
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 07f30b9037cf983b18f31bc5fc10328928d75aee..d43f703a9b6d1a6ed3423f42f54c8efb37311883 100644
+index fb650c09dbcefa0ff021f7c508ff6811a48bee7a..68cce071c740c90149225b4a28af849237b4492b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1566,6 +1566,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1567,6 +1567,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          return new DifficultyDamageScaler(this.getDifficulty(), this.getDayTime(), i, f);
      }
  
diff --git a/patches/server/0086-Add-allow-water-in-end-world-option.patch b/patches/server/0086-Add-allow-water-in-end-world-option.patch
index 1d6bb35ad..8c9ed235f 100644
--- a/patches/server/0086-Add-allow-water-in-end-world-option.patch
+++ b/patches/server/0086-Add-allow-water-in-end-world-option.patch
@@ -49,10 +49,10 @@ index 120bf8436fd82294c339add2e7bff1cda8311aea..848a185c04aa90a62e6bcc49ad68a748
  
                  return true;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d43f703a9b6d1a6ed3423f42f54c8efb37311883..7a9442e89e951ed67947448d86d64d88f7880df0 100644
+index 68cce071c740c90149225b4a28af849237b4492b..f260d01aad4db512952e5a53bf5bc01023bbd43d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1641,4 +1641,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1642,4 +1642,14 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
      public final boolean isDebugWorld() {
          return this.debugWorld;
      }
diff --git a/patches/server/0108-Stop-squids-floating-on-top-of-water.patch b/patches/server/0108-Stop-squids-floating-on-top-of-water.patch
index 7dc4edfb0..a18175397 100644
--- a/patches/server/0108-Stop-squids-floating-on-top-of-water.patch
+++ b/patches/server/0108-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 d542cd8014a929b421e631075f1ee14423e9b66a..bbe567dad1212ad3a49503ca9b33c3f28c58a16d 100644
+index 36e92f884ea5af69798c9b305b7aaf021da4bf04..247d6d425ca60751fac78e5316449a326b11703d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -3450,8 +3450,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3456,8 +3456,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.lastYaw = this.yaw;
      }
  
diff --git a/patches/server/0109-Ridables.patch b/patches/server/0109-Ridables.patch
index fc51f7f77..090fbfb4d 100644
--- a/patches/server/0109-Ridables.patch
+++ b/patches/server/0109-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 bbe567dad1212ad3a49503ca9b33c3f28c58a16d..0be1f47b13f617a7aaad4d6334929d9e5f943d3e 100644
+index 247d6d425ca60751fac78e5316449a326b11703d..52325b6f212455dd19c7ee5b2d85a85f2d077418 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
@@ -259,7 +259,7 @@ index bbe567dad1212ad3a49503ca9b33c3f28c58a16d..0be1f47b13f617a7aaad4d6334929d9e
      public void n(float f) {}
  
      public boolean bL() {
-@@ -3203,6 +3220,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3209,6 +3226,18 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return false;
      }
  
@@ -278,7 +278,7 @@ index bbe567dad1212ad3a49503ca9b33c3f28c58a16d..0be1f47b13f617a7aaad4d6334929d9e
      @Override
      public void sendMessage(IChatBaseComponent ichatbasecomponent, UUID uuid) {}
  
-@@ -3655,4 +3684,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3661,4 +3690,47 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return ((ChunkProviderServer) world.getChunkProvider()).isInEntityTickingChunk(this);
      }
      // Paper end
@@ -5026,10 +5026,10 @@ index 5af554870bcf36e47aef43b966b141b9eda6c4d5..c59305ef7dd7847e204d4c4ed79758bf
          return new Vec3D(this.x * d0, this.y * d1, this.z * d2);
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7a9442e89e951ed67947448d86d64d88f7880df0..1cd1255d5e7fc907a0621e0db31c35a622fe2377 100644
+index f260d01aad4db512952e5a53bf5bc01023bbd43d..cf1f4fe5832781df7d0bdd5eb24eff8539691c30 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -1650,5 +1650,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1651,5 +1651,10 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
      public boolean isTheEnd() {
          return getWorld().getEnvironment() == org.bukkit.World.Environment.THE_END;
      }
diff --git a/patches/server/0112-Entities-can-use-portals-configuration.patch b/patches/server/0112-Entities-can-use-portals-configuration.patch
index 15dddf784..21ffc2084 100644
--- a/patches/server/0112-Entities-can-use-portals-configuration.patch
+++ b/patches/server/0112-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 0be1f47b13f617a7aaad4d6334929d9e5f943d3e..b882c049870e461472fe3252922f206c6045dbff 100644
+index 52325b6f212455dd19c7ee5b2d85a85f2d077418..d75d34700e7017b3d09f01f2e05ac1aaec09fa70 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2422,7 +2422,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,7 +17,7 @@ index 0be1f47b13f617a7aaad4d6334929d9e5f943d3e..b882c049870e461472fe3252922f206c
              if (!this.world.isClientSide && !blockposition.equals(this.ac)) {
                  this.ac = blockposition.immutableCopy();
              }
-@@ -2996,7 +2996,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -3002,7 +3002,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public boolean canPortal() {
diff --git a/patches/server/0115-Allow-toggling-special-MobSpawners-per-world.patch b/patches/server/0115-Allow-toggling-special-MobSpawners-per-world.patch
index 1d6ae2451..b898e332e 100644
--- a/patches/server/0115-Allow-toggling-special-MobSpawners-per-world.patch
+++ b/patches/server/0115-Allow-toggling-special-MobSpawners-per-world.patch
@@ -29,7 +29,7 @@ index 8d89f51182444852062d549d23c00a93e601eb38..072ec40f751b19c2a78dfcc6e439c643
              if (SpawnerCreature.a(EntityPositionTypes.Surface.ON_GROUND, iworldreader, blockposition2, EntityTypes.WANDERING_TRADER)) {
                  blockposition1 = blockposition2;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1cd1255d5e7fc907a0621e0db31c35a622fe2377..ab99bce8c0ae2efb1072c6d154d15089aed2f941 100644
+index cf1f4fe5832781df7d0bdd5eb24eff8539691c30..aa1b037c0103552761b81318f1d2ad8215bd0370 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -156,7 +156,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
diff --git a/patches/server/0131-Add-adjustable-breeding-cooldown-to-config.patch b/patches/server/0131-Add-adjustable-breeding-cooldown-to-config.patch
index 132cdab00..26ddfea15 100644
--- a/patches/server/0131-Add-adjustable-breeding-cooldown-to-config.patch
+++ b/patches/server/0131-Add-adjustable-breeding-cooldown-to-config.patch
@@ -33,7 +33,7 @@ index bba343542e7e6fa83ec802d97b4c139bb210ab28..d9f9e2235d091e14e5d34bb9a3273e7f
              int experience = this.getRandom().nextInt(7) + 1;
              org.bukkit.event.entity.EntityBreedEvent entityBreedEvent = org.bukkit.craftbukkit.event.CraftEventFactory.callEntityBreedEvent(entityageable, this, entityanimal, entityplayer, this.breedItem, experience);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ab99bce8c0ae2efb1072c6d154d15089aed2f941..3c02c34a13995f7805cd0196b6e2fd150061250c 100644
+index aa1b037c0103552761b81318f1d2ad8215bd0370..91aa8a2bc111ee6935ada0ae471fe1a3bc8fad80 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -104,6 +104,48 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
diff --git a/patches/server/0133-Apply-display-names-from-item-forms-of-entities-to-e.patch b/patches/server/0133-Apply-display-names-from-item-forms-of-entities-to-e.patch
index 5db2dd5ab..1010200fb 100644
--- a/patches/server/0133-Apply-display-names-from-item-forms-of-entities-to-e.patch
+++ b/patches/server/0133-Apply-display-names-from-item-forms-of-entities-to-e.patch
@@ -176,10 +176,10 @@ index a3eaeeda875d96fe4b047bd6bf993018722c96b9..f2f800087adb0238b4b672b9f6f4c8c4
  
              if (((EntityHanging) object).survives()) {
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 623bcb93cbdf0f67ee999104936f9d60c5228037..eb115a9c2aac9abe28d36f6284ca84f694a4898d 100644
+index f5802f14b84a5b177ddbdb53a6c3ce892ef310f6..d65375f8849dcbcad4f0fbc456a005247145c724 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -738,6 +738,7 @@ public final class ItemStack {
+@@ -733,6 +733,7 @@ public final class ItemStack {
          return this.getItem().h(this);
      }
  
diff --git a/patches/server/0148-PaperPR-Config-option-for-Piglins-guarding-chests.patch b/patches/server/0148-PaperPR-Config-option-for-Piglins-guarding-chests.patch
index f9ef3f950..87d7db768 100644
--- a/patches/server/0148-PaperPR-Config-option-for-Piglins-guarding-chests.patch
+++ b/patches/server/0148-PaperPR-Config-option-for-Piglins-guarding-chests.patch
@@ -5,10 +5,10 @@ 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 5b2077c90e2a3010a6a596d7e3551e791e670d16..ff5e4812819f45c57a662b8fd63c836785782bdb 100644
+index 0ba5734e60467e34c73d4ed92f5a030af9817582..d5ae1938d9dcd84975fe4e21674fba2c2d450def 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -695,6 +695,11 @@ public class PaperWorldConfig {
+@@ -697,6 +697,11 @@ public class PaperWorldConfig {
          zombiesTargetTurtleEggs = getBoolean("zombies-target-turtle-eggs", zombiesTargetTurtleEggs);
      }
  
diff --git a/patches/server/0151-Lobotomize-stuck-villagers.patch b/patches/server/0151-Lobotomize-stuck-villagers.patch
index b65db21d0..dbb267d42 100644
--- a/patches/server/0151-Lobotomize-stuck-villagers.patch
+++ b/patches/server/0151-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 b882c049870e461472fe3252922f206c6045dbff..073be230a8c0e2ccf6b4304e2988c270749f1a35 100644
+index d75d34700e7017b3d09f01f2e05ac1aaec09fa70..1f73c9c919e5861b76955168691dc6bc0669ce9a 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/0171-Movement-options-for-armour-stands.patch b/patches/server/0171-Movement-options-for-armour-stands.patch
index 69f9864da..9181a7b72 100644
--- a/patches/server/0171-Movement-options-for-armour-stands.patch
+++ b/patches/server/0171-Movement-options-for-armour-stands.patch
@@ -17,7 +17,7 @@ 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/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 073be230a8c0e2ccf6b4304e2988c270749f1a35..b521a9984c327f74bccd634a8bfe26f2cd638462 100644
+index 1f73c9c919e5861b76955168691dc6bc0669ce9a..d92b8afe9d6471b66069527e8bd9a6ec370605ae 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1369,7 +1369,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke