Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
60135676 [Auto] Updated Upstream (CraftBukkit)
fa90052a Fix MC-125757 (#3859)
071c08d7 Only convert lore lines that actually look legacy
8c4787e3 Misc Improvements to Async Teleporting and Light patch
6133c83b [Auto] Updated Upstream (Bukkit/CraftBukkit)

patches/server/0001-Tuinity-Server-Changes.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Tuinity Server Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index ef8ee637a8..6fd5968178 100644
+index ef8ee637a..6fd596817 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,11 +1,11 @@
@@ -65,7 +65,7 @@ index ef8ee637a8..6fd5968178 100644
                  </configuration>
                  <executions>
 diff --git a/src/main/java/co/aikar/timings/MinecraftTimings.java b/src/main/java/co/aikar/timings/MinecraftTimings.java
-index dd07223978..2966c57317 100644
+index dd0722397..2966c5731 100644
 --- a/src/main/java/co/aikar/timings/MinecraftTimings.java
 +++ b/src/main/java/co/aikar/timings/MinecraftTimings.java
 @@ -43,6 +43,8 @@ public final class MinecraftTimings {
@@ -78,7 +78,7 @@ index dd07223978..2966c57317 100644
  
      private MinecraftTimings() {}
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
-index e33e889c29..5dfa065883 100644
+index e33e889c2..5dfa06588 100644
 --- a/src/main/java/co/aikar/timings/TimingsExport.java
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
 @@ -229,7 +229,8 @@ public class TimingsExport extends Thread {
@@ -92,7 +92,7 @@ index e33e889c29..5dfa065883 100644
  
          new TimingsExport(listeners, parent, history).start();
 diff --git a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
-index 49a38c6608..255bbd6e48 100644
+index 49a38c660..255bbd6e4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperVersionFetcher.java
 @@ -24,8 +24,8 @@ public class PaperVersionFetcher implements VersionFetcher {
@@ -123,7 +123,7 @@ index 49a38c6608..255bbd6e48 100644
          switch (distance) {
              case -1:
 diff --git a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java
-index 0692fe33bb..4263eb9172 100644
+index 0692fe33b..4263eb917 100644
 --- a/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java
 +++ b/src/main/java/com/destroystokyo/paper/server/ticklist/PaperTickList.java
 @@ -188,6 +188,7 @@ public final class PaperTickList<T> extends TickListServer<T> { // extend to avo
@@ -200,7 +200,7 @@ index 0692fe33bb..4263eb9172 100644
  
 diff --git a/src/main/java/com/tuinity/tuinity/chunk/SingleThreadChunkRegionManager.java b/src/main/java/com/tuinity/tuinity/chunk/SingleThreadChunkRegionManager.java
 new file mode 100644
-index 0000000000..97c4100c5d
+index 000000000..97c4100c5
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/chunk/SingleThreadChunkRegionManager.java
 @@ -0,0 +1,159 @@
@@ -366,7 +366,7 @@ index 0000000000..97c4100c5d
 \ No newline at end of file
 diff --git a/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 new file mode 100644
-index 0000000000..1ae1fd7505
+index 000000000..1ae1fd750
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 @@ -0,0 +1,277 @@
@@ -650,7 +650,7 @@ index 0000000000..1ae1fd7505
 \ No newline at end of file
 diff --git a/src/main/java/com/tuinity/tuinity/util/CachedLists.java b/src/main/java/com/tuinity/tuinity/util/CachedLists.java
 new file mode 100644
-index 0000000000..a54f516ba7
+index 000000000..a54f516ba
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/util/CachedLists.java
 @@ -0,0 +1,53 @@
@@ -709,7 +709,7 @@ index 0000000000..a54f516ba7
 +}
 diff --git a/src/main/java/com/tuinity/tuinity/util/TickThread.java b/src/main/java/com/tuinity/tuinity/util/TickThread.java
 new file mode 100644
-index 0000000000..08ed243259
+index 000000000..08ed24325
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/util/TickThread.java
 @@ -0,0 +1,41 @@
@@ -757,7 +757,7 @@ index 0000000000..08ed243259
 \ No newline at end of file
 diff --git a/src/main/java/com/tuinity/tuinity/util/maplist/IteratorSafeOrderedReferenceSet.java b/src/main/java/com/tuinity/tuinity/util/maplist/IteratorSafeOrderedReferenceSet.java
 new file mode 100644
-index 0000000000..e12d096456
+index 000000000..e12d09645
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/util/maplist/IteratorSafeOrderedReferenceSet.java
 @@ -0,0 +1,265 @@
@@ -1028,7 +1028,7 @@ index 0000000000..e12d096456
 +}
 diff --git a/src/main/java/com/tuinity/tuinity/voxel/AABBVoxelShape.java b/src/main/java/com/tuinity/tuinity/voxel/AABBVoxelShape.java
 new file mode 100644
-index 0000000000..76593df295
+index 000000000..76593df29
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/voxel/AABBVoxelShape.java
 @@ -0,0 +1,246 @@
@@ -1279,7 +1279,7 @@ index 0000000000..76593df295
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
-index ed9b2f9adf..d54bf71409 100644
+index ed9b2f9ad..d54bf7140 100644
 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
 +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
 @@ -13,6 +13,119 @@ public class AxisAlignedBB {
@@ -1427,7 +1427,7 @@ index ed9b2f9adf..d54bf71409 100644
          return d0 >= this.minX && d0 < this.maxX && d1 >= this.minY && d1 < this.maxY && d2 >= this.minZ && d2 < this.maxZ;
      }
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index 1842e69839..dab89b0c69 100644
+index 1842e6983..dab89b0c6 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -16,9 +16,9 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
@@ -1463,7 +1463,7 @@ index 1842e69839..dab89b0c69 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
-index db198811dd..52ebdfcc03 100644
+index db198811d..52ebdfcc0 100644
 --- a/src/main/java/net/minecraft/server/BiomeBase.java
 +++ b/src/main/java/net/minecraft/server/BiomeBase.java
 @@ -92,6 +92,18 @@ public class BiomeBase {
@@ -1486,7 +1486,7 @@ index db198811dd..52ebdfcc03 100644
          if (biomebase_a.a != null && biomebase_a.b != null && biomebase_a.c != null && biomebase_a.d != null && biomebase_a.e != null && biomebase_a.f != null && biomebase_a.g != null && biomebase_a.j != null) {
              this.m = biomebase_a.a;
 diff --git a/src/main/java/net/minecraft/server/BlockBase.java b/src/main/java/net/minecraft/server/BlockBase.java
-index ff770a3b0e..12027ecad7 100644
+index ff770a3b0..12027ecad 100644
 --- a/src/main/java/net/minecraft/server/BlockBase.java
 +++ b/src/main/java/net/minecraft/server/BlockBase.java
 @@ -176,8 +176,8 @@ public abstract class BlockBase {
@@ -1609,7 +1609,7 @@ index ff770a3b0e..12027ecad7 100644
  
          public SoundEffectType getStepSound() {
 diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java
-index 44b9bfcdc7..dba774018c 100644
+index 44b9bfcdc..dba774018 100644
 --- a/src/main/java/net/minecraft/server/BlockChest.java
 +++ b/src/main/java/net/minecraft/server/BlockChest.java
 @@ -10,7 +10,7 @@ import javax.annotation.Nullable;
@@ -1631,7 +1631,7 @@ index 44b9bfcdc7..dba774018c 100644
              if (tileentity instanceof IInventory) {
                  InventoryUtils.dropInventory(world, blockposition, (IInventory) tileentity);
 diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java
-index c3133814f1..4f10ca5ada 100644
+index c3133814f..4f10ca5ad 100644
 --- a/src/main/java/net/minecraft/server/BlockPiston.java
 +++ b/src/main/java/net/minecraft/server/BlockPiston.java
 @@ -270,7 +270,10 @@ public class BlockPiston extends BlockDirectional {
@@ -1688,7 +1688,7 @@ index c3133814f1..4f10ca5ada 100644
                  aiblockdata[j++] = iblockdata1;
              }
 diff --git a/src/main/java/net/minecraft/server/BlockPistonMoving.java b/src/main/java/net/minecraft/server/BlockPistonMoving.java
-index 4bf66420f5..bf76615d72 100644
+index 4bf66420f..bf76615d7 100644
 --- a/src/main/java/net/minecraft/server/BlockPistonMoving.java
 +++ b/src/main/java/net/minecraft/server/BlockPistonMoving.java
 @@ -21,7 +21,12 @@ public class BlockPistonMoving extends BlockTileEntity {
@@ -1706,7 +1706,7 @@ index 4bf66420f5..bf76615d72 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 8c2a4b57ab..7ff4948a47 100644
+index 8c2a4b57a..7ff4948a4 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -386,11 +386,11 @@ public class BlockPosition extends BaseBlockPosition {
@@ -1808,7 +1808,7 @@ index 8c2a4b57ab..7ff4948a47 100644
  
          @Override
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 84dc89d961..09b8f9a3f6 100644
+index 84dc89d96..09b8f9a3f 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -375,7 +375,7 @@ public class Chunk implements IChunkAccess {
@@ -1916,7 +1916,7 @@ index 84dc89d961..09b8f9a3f6 100644
          int j = MathHelper.floor((axisalignedbb.maxY + 2.0D) / 16.0D);
  
 diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
-index 893c0085bc..d83d3b54d3 100644
+index 893c0085b..d83d3b54d 100644
 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
 +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
 @@ -31,7 +31,7 @@ public abstract class ChunkMapDistance {
@@ -2085,7 +2085,7 @@ index 893c0085bc..d83d3b54d3 100644
  
          for (java.util.Iterator<Entry<ArraySetSorted<Ticket<?>>>> iterator = this.tickets.long2ObjectEntrySet().fastIterator(); iterator.hasNext();) {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index ef980f9859..0459a591ac 100644
+index ef980f985..0459a591a 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -120,7 +120,7 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -2496,7 +2496,7 @@ index ef980f9859..0459a591ac 100644
          try {
              boolean execChunkTask = com.destroystokyo.paper.io.chunk.ChunkTaskManager.pollChunkWaitQueue() || ChunkProviderServer.this.world.asyncChunkTaskManager.pollNextChunkTask(); // Paper
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index ac58fcb798..742c59cb05 100644
+index ac58fcb79..742c59cb0 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -24,6 +24,14 @@ public class ChunkRegionLoader {
@@ -2528,7 +2528,7 @@ index ac58fcb798..742c59cb05 100644
          nbttagcompound1.setString("Status", ichunkaccess.getChunkStatus().d());
          ChunkConverter chunkconverter = ichunkaccess.p();
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 8d45588ecf..4ab7419855 100644
+index 8d45588ec..4ab741985 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
 @@ -96,6 +96,7 @@ public class ChunkSection {
@@ -2540,7 +2540,7 @@ index 8d45588ecf..4ab7419855 100644
          return this.nonEmptyBlockCount == 0;
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkStatus.java b/src/main/java/net/minecraft/server/ChunkStatus.java
-index 36c2651229..dd8a3dc4fe 100644
+index 36c265122..dd8a3dc4f 100644
 --- a/src/main/java/net/minecraft/server/ChunkStatus.java
 +++ b/src/main/java/net/minecraft/server/ChunkStatus.java
 @@ -109,7 +109,7 @@ public class ChunkStatus {
@@ -2562,7 +2562,7 @@ index 36c2651229..dd8a3dc4fe 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java
-index 235c9ec37c..dba3c407c1 100644
+index 235c9ec37..dba3c407c 100644
 --- a/src/main/java/net/minecraft/server/DataBits.java
 +++ b/src/main/java/net/minecraft/server/DataBits.java
 @@ -52,6 +52,7 @@ public class DataBits {
@@ -2590,7 +2590,7 @@ index 235c9ec37c..dba3c407c1 100644
          //Validate.inclusiveBetween(0L, (long) (this.e - 1), (long) i); // Paper
          int j = this.b(i);
 diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
-index 1cb45f97b6..e60ad41b22 100644
+index 1cb45f97b..e60ad41b2 100644
 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
 +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
 @@ -163,6 +163,7 @@ public class DataPaletteBlock<T> implements DataPaletteExpandable<T> {
@@ -2602,7 +2602,7 @@ index 1cb45f97b6..e60ad41b22 100644
          T t0 = this.h.a(this.a.a(i));
  
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 8b2755a3b9..578f7809cb 100644
+index 8b2755a3b..578f7809c 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -170,6 +170,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -2614,7 +2614,7 @@ index 8b2755a3b9..578f7809cb 100644
          this.setPVP(dedicatedserverproperties.pvp);
          this.setAllowFlight(dedicatedserverproperties.allowFlight);
 diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java
-index 550232cb38..229c3b0f0c 100644
+index 550232cb3..229c3b0f0 100644
 --- a/src/main/java/net/minecraft/server/EULA.java
 +++ b/src/main/java/net/minecraft/server/EULA.java
 @@ -70,7 +70,7 @@ public class EULA {
@@ -2627,7 +2627,7 @@ index 550232cb38..229c3b0f0c 100644
                      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 9c4b02d776..3db19a9bab 100644
+index 9c4b02d77..3db19a9ba 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
@@ -2906,7 +2906,7 @@ index 9c4b02d776..3db19a9bab 100644
              int j = MathHelper.floor(d1);
              int k = MathHelper.floor(d2);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c388999d10..4545bd371c 100644
+index c388999d1..4545bd371 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2835,7 +2835,11 @@ public abstract class EntityLiving extends Entity {
@@ -2933,7 +2933,7 @@ index c388999d10..4545bd371c 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index f75c09d44a..bfb931268d 100644
+index f75c09d44..bfb931268 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -74,6 +74,7 @@ public class EntityTrackerEntry {
@@ -2945,7 +2945,7 @@ index f75c09d44a..bfb931268d 100644
  
          if (!list.equals(this.p)) {
 diff --git a/src/main/java/net/minecraft/server/Fluid.java b/src/main/java/net/minecraft/server/Fluid.java
-index 05fa52c0b1..8ffc5db509 100644
+index 05fa52c0b..8ffc5db50 100644
 --- a/src/main/java/net/minecraft/server/Fluid.java
 +++ b/src/main/java/net/minecraft/server/Fluid.java
 @@ -9,8 +9,12 @@ public final class Fluid extends IBlockDataHolder<FluidType, Fluid> {
@@ -2971,7 +2971,7 @@ index 05fa52c0b1..8ffc5db509 100644
  
      public float getHeight(IBlockAccess iblockaccess, BlockPosition blockposition) {
 diff --git a/src/main/java/net/minecraft/server/HeightMap.java b/src/main/java/net/minecraft/server/HeightMap.java
-index 068b92c5c4..a43c4ca3ea 100644
+index 068b92c5c..a43c4ca3e 100644
 --- a/src/main/java/net/minecraft/server/HeightMap.java
 +++ b/src/main/java/net/minecraft/server/HeightMap.java
 @@ -19,7 +19,25 @@ public class HeightMap {
@@ -3055,7 +3055,7 @@ index 068b92c5c4..a43c4ca3ea 100644
              this.i = heightmap_use;
              this.j = predicate;
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index 10a5901db1..9117504767 100644
+index 10a5901db..911750476 100644
 --- a/src/main/java/net/minecraft/server/IBlockData.java
 +++ b/src/main/java/net/minecraft/server/IBlockData.java
 @@ -8,6 +8,19 @@ public class IBlockData extends BlockBase.BlockData {
@@ -3079,7 +3079,7 @@ index 10a5901db1..9117504767 100644
          super(block, immutablemap, mapcodec);
      }
 diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java
-index 582a5695ba..5601088cd5 100644
+index 582a5695b..5601088cd 100644
 --- a/src/main/java/net/minecraft/server/IChunkLoader.java
 +++ b/src/main/java/net/minecraft/server/IChunkLoader.java
 @@ -21,7 +21,7 @@ public class IChunkLoader implements AutoCloseable {
@@ -3092,7 +3092,7 @@ index 582a5695ba..5601088cd5 100644
          // Paper - nuke IOWorker
      }
 diff --git a/src/main/java/net/minecraft/server/ICollisionAccess.java b/src/main/java/net/minecraft/server/ICollisionAccess.java
-index 1cc40b1f0a..3ce2f7497a 100644
+index 1cc40b1f0..3ce2f7497 100644
 --- a/src/main/java/net/minecraft/server/ICollisionAccess.java
 +++ b/src/main/java/net/minecraft/server/ICollisionAccess.java
 @@ -46,6 +46,11 @@ public interface ICollisionAccess extends IBlockAccess {
@@ -3108,7 +3108,7 @@ index 1cc40b1f0a..3ce2f7497a 100644
          return this.d(entity, axisalignedbb, predicate).allMatch(VoxelShape::isEmpty);
          } finally { if (entity != null) entity.collisionLoadChunks = false; } // Paper
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index 267a6baae8..0edcb775e9 100644
+index 267a6baae..0edcb775e 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
 @@ -69,6 +69,7 @@ public interface IEntityAccess {
@@ -3120,7 +3120,7 @@ index 267a6baae8..0edcb775e9 100644
                  return entity == null || !entity.isSameVehicle(entity1);
              });
 diff --git a/src/main/java/net/minecraft/server/LightEngineStorage.java b/src/main/java/net/minecraft/server/LightEngineStorage.java
-index b98e60772b..e0bbfe1422 100644
+index b98e60772..e0bbfe142 100644
 --- a/src/main/java/net/minecraft/server/LightEngineStorage.java
 +++ b/src/main/java/net/minecraft/server/LightEngineStorage.java
 @@ -23,7 +23,8 @@ public abstract class LightEngineStorage<M extends LightEngineStorageArray<M>> e
@@ -3152,7 +3152,7 @@ index b98e60772b..e0bbfe1422 100644
              while (objectiterator.hasNext()) {
                  entry = (Entry) objectiterator.next();
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index e9cedbc8b6..a29d54c775 100644
+index e9cedbc8b..a29d54c77 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -48,6 +48,20 @@ public final class MCUtil {
@@ -3177,7 +3177,7 @@ index e9cedbc8b6..a29d54c775 100644
  
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 26f230a801..eb71fa6e39 100644
+index 26f230a80..eb71fa6e3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -986,7 +986,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -3369,7 +3369,7 @@ index 26f230a801..eb71fa6e39 100644
  
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index d5cc2af83a..327bb3e744 100644
+index d5cc2af83..327bb3e74 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -71,6 +71,39 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -3489,7 +3489,7 @@ index d5cc2af83a..327bb3e744 100644
          }
          return true;
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 8335d00336..e0ee524093 100644
+index 8335d0033..e0ee52409 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -19,7 +19,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -3659,7 +3659,7 @@ index 8335d00336..e0ee524093 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java
-index d7f0df123b..ec55785af2 100644
+index d7f0df123..ec55785af 100644
 --- a/src/main/java/net/minecraft/server/PathfinderNormal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java
 @@ -538,7 +538,7 @@ public class PathfinderNormal extends PathfinderAbstract {
@@ -3672,7 +3672,7 @@ index d7f0df123b..ec55785af2 100644
                      return fluid.a((Tag) TagsFluid.WATER) ? PathType.WATER : (fluid.a((Tag) TagsFluid.LAVA) ? PathType.LAVA : PathType.OPEN);
                  }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index a3bce8f13b..a483ec0e2b 100644
+index a3bce8f13..a483ec0e2 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -494,6 +494,7 @@ public class PlayerChunk {
@@ -3773,7 +3773,7 @@ index a3bce8f13b..a483ec0e2b 100644
                  if (chunk != null) {
                      playerchunkmap.callbackExecutor.execute(() -> {
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 8c5639fa55..4dd6f48caf 100644
+index 5544254a6..ab751b48d 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -119,31 +119,28 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -3940,7 +3940,7 @@ index 8c5639fa55..4dd6f48caf 100644
      // Paper end - optimised tracker
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index cf83059fec..37f55c66b6 100644
+index cf83059fe..37f55c66b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -322,19 +322,24 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -4045,7 +4045,7 @@ index cf83059fec..37f55c66b6 100644
                              } else {
                                  // CraftBukkit start - fire PlayerMoveEvent
 diff --git a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
-index 7ea293f38d..e698dd2260 100644
+index 7ea293f38..e698dd226 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnectionUtils.java
 @@ -13,10 +13,30 @@ public class PlayerConnectionUtils {
@@ -4093,7 +4093,7 @@ index 7ea293f38d..e698dd2260 100644
              });
              throw CancelledPacketHandleException.INSTANCE;
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 6d192b2744..f5de49e3e3 100644
+index 6d192b274..f5de49e3e 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -21,14 +21,29 @@ public class PlayerInteractManager {
@@ -4228,7 +4228,7 @@ index 6d192b2744..f5de49e3e3 100644
              this.player.playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition)); // CraftBukkit - SPIGOT-5196
          }
 diff --git a/src/main/java/net/minecraft/server/ProtoChunk.java b/src/main/java/net/minecraft/server/ProtoChunk.java
-index 3b03c28ee5..6ac9f437e8 100644
+index 3b03c28ee..6ac9f437e 100644
 --- a/src/main/java/net/minecraft/server/ProtoChunk.java
 +++ b/src/main/java/net/minecraft/server/ProtoChunk.java
 @@ -179,14 +179,11 @@ public class ProtoChunk implements IChunkAccess {
@@ -4264,7 +4264,7 @@ index 3b03c28ee5..6ac9f437e8 100644
                  }
  
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 93797395c3..6928b1730f 100644
+index 93797395c..6928b1730 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -28,14 +28,349 @@ public class RegionFile implements AutoCloseable {
@@ -4826,7 +4826,7 @@ index 93797395c3..6928b1730f 100644
          ((java.nio.Buffer) this.f).position(0);
          this.dataFile.write(this.f, 0L);
 diff --git a/src/main/java/net/minecraft/server/RegionFileBitSet.java b/src/main/java/net/minecraft/server/RegionFileBitSet.java
-index 1ebdf73cc9..cfa3ecb031 100644
+index 1ebdf73cc..cfa3ecb03 100644
 --- a/src/main/java/net/minecraft/server/RegionFileBitSet.java
 +++ b/src/main/java/net/minecraft/server/RegionFileBitSet.java
 @@ -4,18 +4,42 @@ import java.util.BitSet;
@@ -4874,7 +4874,7 @@ index 1ebdf73cc9..cfa3ecb031 100644
          int j = 0;
  
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 867dc074bc..60b4171a3a 100644
+index 867dc074b..60b4171a3 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -14,12 +14,43 @@ public class RegionFileCache implements AutoCloseable { // Paper - no final
@@ -4965,7 +4965,7 @@ index 867dc074bc..60b4171a3a 100644
              }
  
 diff --git a/src/main/java/net/minecraft/server/RegionFileCompression.java b/src/main/java/net/minecraft/server/RegionFileCompression.java
-index 3382d678e6..29137f4959 100644
+index 3382d678e..29137f495 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCompression.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCompression.java
 @@ -13,7 +13,7 @@ import javax.annotation.Nullable;
@@ -4997,7 +4997,7 @@ index 3382d678e6..29137f4959 100644
          return (InputStream) this.f.wrap(inputstream);
      }
 diff --git a/src/main/java/net/minecraft/server/Ticket.java b/src/main/java/net/minecraft/server/Ticket.java
-index e41cb8613e..c19ffb925a 100644
+index e41cb8613..c19ffb925 100644
 --- a/src/main/java/net/minecraft/server/Ticket.java
 +++ b/src/main/java/net/minecraft/server/Ticket.java
 @@ -5,17 +5,17 @@ import java.util.Objects;
@@ -5034,7 +5034,7 @@ index e41cb8613e..c19ffb925a 100644
          return j != 0L && i - this.d > j;
      }
 diff --git a/src/main/java/net/minecraft/server/TicketType.java b/src/main/java/net/minecraft/server/TicketType.java
-index 5c789b25f1..4657b05a42 100644
+index 5c789b25f..4657b05a4 100644
 --- a/src/main/java/net/minecraft/server/TicketType.java
 +++ b/src/main/java/net/minecraft/server/TicketType.java
 @@ -26,7 +26,8 @@ public class TicketType<T> {
@@ -5048,7 +5048,7 @@ index 5c789b25f1..4657b05a42 100644
      public static <T> TicketType<T> a(String s, Comparator<T> comparator) {
          return new TicketType<>(s, comparator, 0L);
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 67fda8bd5a..e1f1d6e33f 100644
+index 67fda8bd5..e1f1d6e33 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -12,7 +12,7 @@ import org.bukkit.inventory.InventoryHolder;
@@ -5122,7 +5122,7 @@ index 67fda8bd5a..e1f1d6e33f 100644
      private String tileEntityKeyString = null;
      private MinecraftKey tileEntityKey = null;
 diff --git a/src/main/java/net/minecraft/server/TileEntityBeacon.java b/src/main/java/net/minecraft/server/TileEntityBeacon.java
-index 2858ea1f3e..453f1301b4 100644
+index 2858ea1f3..453f1301b 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBeacon.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBeacon.java
 @@ -35,7 +35,7 @@ public class TileEntityBeacon extends TileEntity implements ITileInventory, ITic
@@ -5173,7 +5173,7 @@ index 2858ea1f3e..453f1301b4 100644
      public void tick() {
          int i = this.position.getX();
 diff --git a/src/main/java/net/minecraft/server/TileEntityBeehive.java b/src/main/java/net/minecraft/server/TileEntityBeehive.java
-index 66ac41db79..016b063645 100644
+index 6dc91d985..9da356de6 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBeehive.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBeehive.java
 @@ -12,6 +12,13 @@ public class TileEntityBeehive extends TileEntity implements ITickable {
@@ -5191,7 +5191,7 @@ index 66ac41db79..016b063645 100644
          super(TileEntityTypes.BEEHIVE);
      }
 diff --git a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java
-index 276eba954b..e38a494d7b 100644
+index 276eba954..e38a494d7 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java
 @@ -24,7 +24,7 @@ public class TileEntityBrewingStand extends TileEntityContainer implements IWorl
@@ -5242,7 +5242,7 @@ index 276eba954b..e38a494d7b 100644
      protected IChatBaseComponent getContainerName() {
          return new ChatMessage("container.brewing");
 diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
-index f6f2743892..f9a878bd0b 100644
+index f6f274389..f9a878bd0 100644
 --- a/src/main/java/net/minecraft/server/TileEntityChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityChest.java
 @@ -45,6 +45,22 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic
@@ -5269,7 +5269,7 @@ index f6f2743892..f9a878bd0b 100644
          super(tileentitytypes);
          this.items = NonNullList.a(27, ItemStack.b);
 diff --git a/src/main/java/net/minecraft/server/TileEntityConduit.java b/src/main/java/net/minecraft/server/TileEntityConduit.java
-index ade8301227..7e9470caa5 100644
+index ade830122..7e9470caa 100644
 --- a/src/main/java/net/minecraft/server/TileEntityConduit.java
 +++ b/src/main/java/net/minecraft/server/TileEntityConduit.java
 @@ -16,15 +16,32 @@ public class TileEntityConduit extends TileEntity implements ITickable {
@@ -5308,7 +5308,7 @@ index ade8301227..7e9470caa5 100644
          this(TileEntityTypes.CONDUIT);
      }
 diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index f4f50fb837..59aa2f8a79 100644
+index f4f50fb83..59aa2f8a7 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
 @@ -32,14 +32,14 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
@@ -5356,7 +5356,7 @@ index f4f50fb837..59aa2f8a79 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/TileEntityJukeBox.java b/src/main/java/net/minecraft/server/TileEntityJukeBox.java
-index 33c7dc56da..75eb1b8b29 100644
+index 33c7dc56d..75eb1b8b2 100644
 --- a/src/main/java/net/minecraft/server/TileEntityJukeBox.java
 +++ b/src/main/java/net/minecraft/server/TileEntityJukeBox.java
 @@ -4,6 +4,13 @@ public class TileEntityJukeBox extends TileEntity implements Clearable {
@@ -5374,7 +5374,7 @@ index 33c7dc56da..75eb1b8b29 100644
          super(TileEntityTypes.JUKEBOX);
          this.a = ItemStack.b;
 diff --git a/src/main/java/net/minecraft/server/TileEntityLectern.java b/src/main/java/net/minecraft/server/TileEntityLectern.java
-index b2ceb6c179..b955d5d661 100644
+index b2ceb6c17..b955d5d66 100644
 --- a/src/main/java/net/minecraft/server/TileEntityLectern.java
 +++ b/src/main/java/net/minecraft/server/TileEntityLectern.java
 @@ -17,7 +17,7 @@ import org.bukkit.inventory.InventoryHolder;
@@ -5451,7 +5451,7 @@ index b2ceb6c179..b955d5d661 100644
          super(TileEntityTypes.LECTERN);
          this.book = ItemStack.b;
 diff --git a/src/main/java/net/minecraft/server/TileEntityPiston.java b/src/main/java/net/minecraft/server/TileEntityPiston.java
-index e7b7e468fc..38d0e841ca 100644
+index e7b7e468f..38d0e841c 100644
 --- a/src/main/java/net/minecraft/server/TileEntityPiston.java
 +++ b/src/main/java/net/minecraft/server/TileEntityPiston.java
 @@ -5,10 +5,10 @@ import java.util.List;
@@ -5581,7 +5581,7 @@ index e7b7e468fc..38d0e841ca 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/Vec3D.java b/src/main/java/net/minecraft/server/Vec3D.java
-index 3048ba0081..84858ba392 100644
+index 3048ba008..84858ba39 100644
 --- a/src/main/java/net/minecraft/server/Vec3D.java
 +++ b/src/main/java/net/minecraft/server/Vec3D.java
 @@ -4,7 +4,7 @@ import java.util.EnumSet;
@@ -5615,7 +5615,7 @@ index 3048ba0081..84858ba392 100644
          return this.x * this.x + this.y * this.y + this.z * this.z;
      }
 diff --git a/src/main/java/net/minecraft/server/VillagePlace.java b/src/main/java/net/minecraft/server/VillagePlace.java
-index 303f6b0953..c1e149f204 100644
+index 303f6b095..c1e149f20 100644
 --- a/src/main/java/net/minecraft/server/VillagePlace.java
 +++ b/src/main/java/net/minecraft/server/VillagePlace.java
 @@ -155,7 +155,7 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
@@ -5628,7 +5628,7 @@ index 303f6b0953..c1e149f204 100644
          }
          // Paper end
 diff --git a/src/main/java/net/minecraft/server/VoxelShape.java b/src/main/java/net/minecraft/server/VoxelShape.java
-index c2b8c98206..3a98e242e0 100644
+index c2b8c9820..3a98e242e 100644
 --- a/src/main/java/net/minecraft/server/VoxelShape.java
 +++ b/src/main/java/net/minecraft/server/VoxelShape.java
 @@ -8,11 +8,11 @@ import javax.annotation.Nullable;
@@ -5667,7 +5667,7 @@ index c2b8c98206..3a98e242e0 100644
          List<AxisAlignedBB> list = Lists.newArrayList();
  
 diff --git a/src/main/java/net/minecraft/server/VoxelShapeArray.java b/src/main/java/net/minecraft/server/VoxelShapeArray.java
-index caf297fe97..8d68c783f6 100644
+index caf297fe9..8d68c783f 100644
 --- a/src/main/java/net/minecraft/server/VoxelShapeArray.java
 +++ b/src/main/java/net/minecraft/server/VoxelShapeArray.java
 @@ -3,6 +3,7 @@ package net.minecraft.server;
@@ -5774,7 +5774,7 @@ index caf297fe97..8d68c783f6 100644
 +    // Tuinity end - optimise multi-aabb shapes
  }
 diff --git a/src/main/java/net/minecraft/server/VoxelShapes.java b/src/main/java/net/minecraft/server/VoxelShapes.java
-index 1fa7061f7a..52aee91d2d 100644
+index 1fa7061f7..52aee91d2 100644
 --- a/src/main/java/net/minecraft/server/VoxelShapes.java
 +++ b/src/main/java/net/minecraft/server/VoxelShapes.java
 @@ -17,18 +17,81 @@ public final class VoxelShapes {
@@ -5901,7 +5901,7 @@ index 1fa7061f7a..52aee91d2d 100644
          return voxelshape != b() && voxelshape1 != b() ? (voxelshape.isEmpty() && voxelshape1.isEmpty() ? false : !c(b(), b(voxelshape, voxelshape1, OperatorBoolean.OR), OperatorBoolean.ONLY_FIRST)) : true;
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5f81997db7..4a956f3681 100644
+index 5f81997db..4a956f368 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 {
@@ -6023,7 +6023,7 @@ index 5f81997db7..4a956f3681 100644
          int j = MathHelper.floor((axisalignedbb.maxX + 2.0D) / 16.0D);
          int k = MathHelper.floor((axisalignedbb.minZ - 2.0D) / 16.0D);
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index b651eb87bb..5cba3b0e61 100644
+index b651eb87b..5cba3b0e6 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
 @@ -47,11 +47,43 @@ public class WorldBorder {
@@ -6095,7 +6095,7 @@ index b651eb87bb..5cba3b0e61 100644
          return this.j.d();
      }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 3a740f5669..fff694c370 100644
+index 3a740f566..fff694c37 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -55,7 +55,7 @@ public class WorldServer extends World implements GeneratorAccessSeed {
@@ -6789,7 +6789,7 @@ index 3a740f5669..fff694c370 100644
              this.tickingEntities = wasTicking; // Paper
          }
 diff --git a/src/main/java/net/minecraft/server/WorldUpgrader.java b/src/main/java/net/minecraft/server/WorldUpgrader.java
-index 5ccdc0b87b..888dae2d5e 100644
+index 5ccdc0b87..888dae2d5 100644
 --- a/src/main/java/net/minecraft/server/WorldUpgrader.java
 +++ b/src/main/java/net/minecraft/server/WorldUpgrader.java
 @@ -218,7 +218,7 @@ public class WorldUpgrader {
@@ -6802,7 +6802,7 @@ index 5ccdc0b87b..888dae2d5e 100644
  
                          try {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
-index 4ec53a54e3..31c81b4b52 100644
+index 4ec53a54e..31c81b4b5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunkSnapshot.java
 @@ -77,7 +77,7 @@ public class CraftChunkSnapshot implements ChunkSnapshot {
@@ -6815,7 +6815,7 @@ index 4ec53a54e3..31c81b4b52 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d8103ab0d5..ba42171096 100644
+index d8103ab0d..ba4217109 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -231,7 +231,7 @@ import javax.annotation.Nullable; // Paper
@@ -6871,7 +6871,7 @@ index d8103ab0d5..ba42171096 100644
          public void restart() {
              org.spigotmc.RestartCommand.restart();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 65b36a1741..b12da9e3b3 100644
+index 65b36a174..b12da9e3b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -336,6 +336,13 @@ public class CraftWorld implements World {
@@ -6922,7 +6922,7 @@ index 65b36a1741..b12da9e3b3 100644
          }, MinecraftServer.getServer());
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index bac292e6d8..b4e65963ef 100644
+index bac292e6d..b4e65963e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -138,6 +138,13 @@ public class Main {
@@ -6949,7 +6949,7 @@ index bac292e6d8..b4e65963ef 100644
                          //Thread.sleep(TimeUnit.SECONDS.toMillis(20));
                          // Paper End
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 9b0e868f00..ee53060b11 100644
+index 9b0e868f0..ee53060b1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -207,7 +207,7 @@ public class CraftBlock implements Block {
@@ -6995,7 +6995,7 @@ index 9b0e868f00..ee53060b11 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
-index 11aa2dc18c..c51c43573f 100644
+index 11aa2dc18..c51c43573 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockState.java
 @@ -136,7 +136,7 @@ public class CraftBlockState implements BlockState {
@@ -7008,7 +7008,7 @@ index 11aa2dc18c..c51c43573f 100644
  
      public void setFlag(int flag) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index bbded5671e..9808901532 100644
+index bbded5671..980890153 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 @@ -44,7 +44,7 @@ public class CraftBlockData implements BlockData {
@@ -7021,10 +7021,39 @@ index bbded5671e..9808901532 100644
  
      public IBlockData getState() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 8002a38bcc..309e7f6ee7 100644
+index d1df4e579..6f18a7898 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -527,6 +527,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -495,27 +495,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+         entity.setHeadRotation(yaw);
+     }
+ 
+-    @Override// Paper start
+-    public java.util.concurrent.CompletableFuture<Boolean> teleportAsync(Location loc, @javax.annotation.Nonnull org.bukkit.event.player.PlayerTeleportEvent.TeleportCause cause) {
+-        net.minecraft.server.PlayerChunkMap playerChunkMap = ((CraftWorld) loc.getWorld()).getHandle().getChunkProvider().playerChunkMap;
+-        java.util.concurrent.CompletableFuture<Boolean> future = new java.util.concurrent.CompletableFuture<>();
+-
+-        loc.getWorld().getChunkAtAsyncUrgently(loc).thenCompose(chunk -> {
+-            net.minecraft.server.ChunkCoordIntPair pair = new net.minecraft.server.ChunkCoordIntPair(chunk.getX(), chunk.getZ());
+-            ((CraftWorld) loc.getWorld()).getHandle().getChunkProvider().addTicketAtLevel(net.minecraft.server.TicketType.POST_TELEPORT, pair, 31, 0);
+-            net.minecraft.server.PlayerChunk updatingChunk = playerChunkMap.getUpdatingChunk(pair.pair());
+-            if (updatingChunk != null) {
+-                return updatingChunk.getEntityTickingFuture();
+-            } else {
+-                return java.util.concurrent.CompletableFuture.completedFuture(com.mojang.datafixers.util.Either.left(((org.bukkit.craftbukkit.CraftChunk)chunk).getHandle()));
+-            }
+-        }).thenAccept((chunk) -> future.complete(teleport(loc, cause))).exceptionally(ex -> {
+-            future.completeExceptionally(ex);
+-            return null;
+-        });
+-        return future;
+-    }
+-    // Paper end
++    // Tuinity
+ 
+     @Override
+     public boolean teleport(Location location) {
+@@ -549,6 +529,37 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return true;
      }
  
@@ -7063,7 +7092,7 @@ index 8002a38bcc..309e7f6ee7 100644
      public boolean teleport(org.bukkit.entity.Entity destination) {
          return teleport(destination.getLocation());
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
-index 948a59217c..ab43c97e8f 100644
+index 948a59217..ab43c97e8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/CraftChunkData.java
 @@ -73,7 +73,7 @@ public final class CraftChunkData implements ChunkGenerator.ChunkData {
@@ -7076,7 +7105,7 @@ index 948a59217c..ab43c97e8f 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
-index ca2be30609..2c57013765 100644
+index ca2be3060..2c5701376 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scoreboard/CraftScoreboardManager.java
 @@ -100,9 +100,18 @@ public final class CraftScoreboardManager implements ScoreboardManager {
@@ -7099,7 +7128,7 @@ index ca2be30609..2c57013765 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java b/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java
-index f72c13beda..50f855b931 100644
+index f72c13bed..50f855b93 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java
 @@ -119,6 +119,32 @@ public class UnsafeList<E> extends AbstractList<E> implements List<E>, RandomAcc
@@ -7136,7 +7165,7 @@ index f72c13beda..50f855b931 100644
      public void clear() {
          // Create new array to reset memory usage to initial capacity
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 674096cab1..001b1e5197 100644
+index 674096cab..001b1e519 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 @@ -11,7 +11,7 @@ public final class Versioning {
@@ -7149,7 +7178,7 @@ index 674096cab1..001b1e5197 100644
  
          if (stream != null) {
 diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java
-index 9f7d2ef932..c3ac1a46c3 100644
+index 9f7d2ef93..c3ac1a46c 100644
 --- a/src/main/java/org/spigotmc/AsyncCatcher.java
 +++ b/src/main/java/org/spigotmc/AsyncCatcher.java
 @@ -10,7 +10,7 @@ public class AsyncCatcher
@@ -7162,7 +7191,7 @@ index 9f7d2ef932..c3ac1a46c3 100644
              throw new IllegalStateException( "Asynchronous " + reason + "!" );
          }
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 513c1041c3..4d31090848 100644
+index 513c1041c..4d3109084 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -61,6 +61,84 @@ public class WatchdogThread extends Thread