Updated Upstream (CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

CraftBukkit Changes:
7f61a252 #640: Fix chunk load/unload callbacks for chunk load cancellations

Spigot-Server-Patches/0004-MC-Utils.patch

@@ -1,4 +1,4 @@
-From 8d910962064780e9aa7660be1cf0ba0a1020275c Mon Sep 17 00:00:00 2001
+From 93be2b61c1b9b98a298c8a7f61a0743ca0d2e578 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:55:47 -0400
 Subject: [PATCH] MC Utils
@@ -6,7 +6,7 @@ Subject: [PATCH] MC Utils
 
 diff --git a/src/main/java/com/destroystokyo/paper/util/concurrent/WeakSeqLock.java b/src/main/java/com/destroystokyo/paper/util/concurrent/WeakSeqLock.java
 new file mode 100644
-index 0000000000..4029dc68cf
+index 000000000..4029dc68c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/concurrent/WeakSeqLock.java
 @@ -0,0 +1,68 @@
@@ -80,7 +80,7 @@ index 0000000000..4029dc68cf
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/util/map/QueuedChangesMapLong2Int.java b/src/main/java/com/destroystokyo/paper/util/map/QueuedChangesMapLong2Int.java
 new file mode 100644
-index 0000000000..968c9ed328
+index 000000000..968c9ed32
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/map/QueuedChangesMapLong2Int.java
 @@ -0,0 +1,156 @@
@@ -242,7 +242,7 @@ index 0000000000..968c9ed328
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/util/map/QueuedChangesMapLong2Object.java b/src/main/java/com/destroystokyo/paper/util/map/QueuedChangesMapLong2Object.java
 new file mode 100644
-index 0000000000..07685b6bd5
+index 000000000..07685b6bd
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/map/QueuedChangesMapLong2Object.java
 @@ -0,0 +1,172 @@
@@ -420,7 +420,7 @@ index 0000000000..07685b6bd5
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/util/maplist/ChunkList.java b/src/main/java/com/destroystokyo/paper/util/maplist/ChunkList.java
 new file mode 100644
-index 0000000000..4ec248adb6
+index 000000000..4ec248adb
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/maplist/ChunkList.java
 @@ -0,0 +1,127 @@
@@ -553,7 +553,7 @@ index 0000000000..4ec248adb6
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/util/maplist/EntityList.java b/src/main/java/com/destroystokyo/paper/util/maplist/EntityList.java
 new file mode 100644
-index 0000000000..f3cb346c9d
+index 000000000..f3cb346c9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/maplist/EntityList.java
 @@ -0,0 +1,126 @@
@@ -685,7 +685,7 @@ index 0000000000..f3cb346c9d
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/util/maplist/IBlockDataList.java b/src/main/java/com/destroystokyo/paper/util/maplist/IBlockDataList.java
 new file mode 100644
-index 0000000000..c2f7e4ca0f
+index 000000000..c2f7e4ca0
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/maplist/IBlockDataList.java
 @@ -0,0 +1,126 @@
@@ -817,7 +817,7 @@ index 0000000000..c2f7e4ca0f
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java b/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java
 new file mode 100644
-index 0000000000..5a44bc644b
+index 000000000..5a44bc644
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/misc/AreaMap.java
 @@ -0,0 +1,389 @@
@@ -1212,7 +1212,7 @@ index 0000000000..5a44bc644b
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/util/misc/PlayerAreaMap.java b/src/main/java/com/destroystokyo/paper/util/misc/PlayerAreaMap.java
 new file mode 100644
-index 0000000000..8a552a87ab
+index 000000000..8a552a87a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/misc/PlayerAreaMap.java
 @@ -0,0 +1,27 @@
@@ -1245,7 +1245,7 @@ index 0000000000..8a552a87ab
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/util/misc/PooledLinkedHashSets.java b/src/main/java/com/destroystokyo/paper/util/misc/PooledLinkedHashSets.java
 new file mode 100644
-index 0000000000..5f2d88797d
+index 000000000..5f2d88797
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/misc/PooledLinkedHashSets.java
 @@ -0,0 +1,289 @@
@@ -1540,7 +1540,7 @@ index 0000000000..5f2d88797d
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/util/set/OptimizedSmallEnumSet.java b/src/main/java/com/destroystokyo/paper/util/set/OptimizedSmallEnumSet.java
 new file mode 100644
-index 0000000000..4d74a7a908
+index 000000000..4d74a7a90
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/set/OptimizedSmallEnumSet.java
 @@ -0,0 +1,65 @@
@@ -1610,7 +1610,7 @@ index 0000000000..4d74a7a908
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/BlockAccessAir.java b/src/main/java/net/minecraft/server/BlockAccessAir.java
-index eff6ebcd30..30cbfc8eac 100644
+index eff6ebcd3..30cbfc8ea 100644
 --- a/src/main/java/net/minecraft/server/BlockAccessAir.java
 +++ b/src/main/java/net/minecraft/server/BlockAccessAir.java
 @@ -14,6 +14,18 @@ public enum BlockAccessAir implements IBlockAccess {
@@ -1633,7 +1633,7 @@ index eff6ebcd30..30cbfc8eac 100644
      public IBlockData getType(BlockPosition blockposition) {
          return Blocks.AIR.getBlockData();
 diff --git a/src/main/java/net/minecraft/server/BlockDataAbstract.java b/src/main/java/net/minecraft/server/BlockDataAbstract.java
-index 1cf97cefc9..2040f18349 100644
+index 1cf97cefc..2040f1834 100644
 --- a/src/main/java/net/minecraft/server/BlockDataAbstract.java
 +++ b/src/main/java/net/minecraft/server/BlockDataAbstract.java
 @@ -78,6 +78,7 @@ public abstract class BlockDataAbstract<O, S> implements IBlockDataHolder<S> {
@@ -1645,7 +1645,7 @@ index 1cf97cefc9..2040f18349 100644
          return this.d.containsKey(iblockstate);
      }
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index c88a62f6b7..5dbd3e60fe 100644
+index c88a62f6b..5dbd3e60f 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -120,6 +120,7 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
@@ -1700,7 +1700,7 @@ index c88a62f6b7..5dbd3e60fe 100644
              this.d = i;
          }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 55373cae07..af10c18d44 100644
+index 55373cae0..af10c18d4 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -25,7 +25,7 @@ import org.apache.logging.log4j.Logger;
@@ -1802,7 +1802,7 @@ index 55373cae07..af10c18d44 100644
      // CraftBukkit end
  
 diff --git a/src/main/java/net/minecraft/server/ChunkCache.java b/src/main/java/net/minecraft/server/ChunkCache.java
-index 11c4d23ba9..53c15c1c0b 100644
+index 11c4d23ba..53c15c1c0 100644
 --- a/src/main/java/net/minecraft/server/ChunkCache.java
 +++ b/src/main/java/net/minecraft/server/ChunkCache.java
 @@ -8,7 +8,7 @@ public class ChunkCache implements IBlockAccess, ICollisionAccess {
@@ -1836,7 +1836,7 @@ index 11c4d23ba9..53c15c1c0b 100644
      @Override
      public TileEntity getTileEntity(BlockPosition blockposition) {
 diff --git a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
-index 260644bf0b..f2a19acd84 100644
+index 260644bf0..f2a19acd8 100644
 --- a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
 +++ b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
 @@ -31,7 +31,9 @@ public class ChunkCoordIntPair {
@@ -1851,7 +1851,7 @@ index 260644bf0b..f2a19acd84 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 43d0776f85..f558ae4417 100644
+index 43d0776f8..f558ae441 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -23,7 +23,7 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -2003,7 +2003,7 @@ index 43d0776f85..f558ae4417 100644
      @Override
      public IChunkAccess getChunkAt(int i, int j, ChunkStatus chunkstatus, boolean flag) {
 diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java
-index 7ca3a1d0c5..2edd9b8714 100644
+index 7ca3a1d0c..2edd9b871 100644
 --- a/src/main/java/net/minecraft/server/DataBits.java
 +++ b/src/main/java/net/minecraft/server/DataBits.java
 @@ -83,6 +83,7 @@ public class DataBits {
@@ -2015,7 +2015,7 @@ index 7ca3a1d0c5..2edd9b8714 100644
          return this.a;
      }
 diff --git a/src/main/java/net/minecraft/server/DataPalette.java b/src/main/java/net/minecraft/server/DataPalette.java
-index 75ba698868..45403fbe30 100644
+index 75ba69886..45403fbe3 100644
 --- a/src/main/java/net/minecraft/server/DataPalette.java
 +++ b/src/main/java/net/minecraft/server/DataPalette.java
 @@ -4,10 +4,12 @@ import javax.annotation.Nullable;
@@ -2032,7 +2032,7 @@ index 75ba698868..45403fbe30 100644
      T a(int i);
  
 diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
-index 774a8f5434..d5f5a51872 100644
+index 774a8f543..d5f5a5187 100644
 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
 +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
 @@ -11,7 +11,7 @@ import java.util.stream.Collectors;
@@ -2074,7 +2074,7 @@ index 774a8f5434..d5f5a51872 100644
          this.a();
          packetdataserializer.writeByte(this.i);
 diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
-index fe69161e5b..b40c8d2f83 100644
+index fe69161e5..b40c8d2f8 100644
 --- a/src/main/java/net/minecraft/server/EntityCreature.java
 +++ b/src/main/java/net/minecraft/server/EntityCreature.java
 @@ -6,6 +6,8 @@ import org.bukkit.event.entity.EntityUnleashEvent;
@@ -2087,7 +2087,7 @@ index fe69161e5b..b40c8d2f83 100644
          super(entitytypes, world);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index bdfb173853..0b06fa2b66 100644
+index bdfb17385..0b06fa2b6 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -146,6 +146,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -2099,7 +2099,7 @@ index bdfb173853..0b06fa2b66 100644
          // CraftBukkit start - fire event
          setGoalTarget(entityliving, EntityTargetEvent.TargetReason.UNKNOWN, true);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3b1bcf3495..1f350e3352 100644
+index 3b1bcf349..1f350e335 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -129,6 +129,7 @@ public abstract class EntityLiving extends Entity {
@@ -2111,7 +2111,7 @@ index 3b1bcf3495..1f350e3352 100644
      @Override
      public float getBukkitYaw() {
 diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java
-index 00c3b666d7..e5322fbae5 100644
+index 00c3b666d..e5322fbae 100644
 --- a/src/main/java/net/minecraft/server/EntityMonster.java
 +++ b/src/main/java/net/minecraft/server/EntityMonster.java
 @@ -5,6 +5,7 @@ import java.util.function.Predicate;
@@ -2123,7 +2123,7 @@ index 00c3b666d7..e5322fbae5 100644
          super(entitytypes, world);
          this.f = 5;
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index ce48210922..57ce9bde64 100644
+index ce4821092..57ce9bde6 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -87,6 +87,8 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -2145,7 +2145,7 @@ index ce48210922..57ce9bde64 100644
          this.displayName = this.getName();
          this.canPickUpLoot = true;
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index f937b72945..cbf0c2f25d 100644
+index f937b7294..cbf0c2f25 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -4,6 +4,7 @@ import com.mojang.datafixers.DataFixUtils;
@@ -2168,7 +2168,7 @@ index f937b72945..cbf0c2f25d 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
-index 1890c760f9..7e5ece9d50 100644
+index 1890c760f..7e5ece9d5 100644
 --- a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
 +++ b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
 @@ -68,6 +68,15 @@ public abstract class IAsyncTaskHandler<R extends Runnable> implements Mailbox<R
@@ -2188,7 +2188,7 @@ index 1890c760f9..7e5ece9d50 100644
          this.d.add(r0);
          LockSupport.unpark(this.getThread());
 diff --git a/src/main/java/net/minecraft/server/IBlockAccess.java b/src/main/java/net/minecraft/server/IBlockAccess.java
-index 3b08770801..0dff023529 100644
+index 3b0877080..0dff02352 100644
 --- a/src/main/java/net/minecraft/server/IBlockAccess.java
 +++ b/src/main/java/net/minecraft/server/IBlockAccess.java
 @@ -9,10 +9,24 @@ public interface IBlockAccess {
@@ -2217,7 +2217,7 @@ index 3b08770801..0dff023529 100644
          return this.getType(blockposition).h();
      }
 diff --git a/src/main/java/net/minecraft/server/IOWorker.java b/src/main/java/net/minecraft/server/IOWorker.java
-index c5658c0779..b90baef0f5 100644
+index c5658c077..b90baef0f 100644
 --- a/src/main/java/net/minecraft/server/IOWorker.java
 +++ b/src/main/java/net/minecraft/server/IOWorker.java
 @@ -22,7 +22,7 @@ public class IOWorker implements AutoCloseable {
@@ -2230,7 +2230,7 @@ index c5658c0779..b90baef0f5 100644
      private boolean g = true;
      private CompletableFuture<Void> h = new CompletableFuture();
 diff --git a/src/main/java/net/minecraft/server/IWorldReader.java b/src/main/java/net/minecraft/server/IWorldReader.java
-index ba315131e1..cbe2aa4c0a 100644
+index ba315131e..cbe2aa4c0 100644
 --- a/src/main/java/net/minecraft/server/IWorldReader.java
 +++ b/src/main/java/net/minecraft/server/IWorldReader.java
 @@ -4,6 +4,7 @@ import javax.annotation.Nullable;
@@ -2242,7 +2242,7 @@ index ba315131e1..cbe2aa4c0a 100644
      IChunkAccess getChunkAt(int i, int j, ChunkStatus chunkstatus, boolean flag);
  
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 75308712d0..aa7501d366 100644
+index 75308712d..aa7501d36 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -37,10 +37,19 @@ import org.bukkit.event.world.StructureGrowEvent;
@@ -2302,7 +2302,7 @@ index 75308712d0..aa7501d366 100644
      // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
 new file mode 100644
-index 0000000000..9fa88d79d8
+index 000000000..9fa88d79d
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -0,0 +1,386 @@
@@ -2693,7 +2693,7 @@ index 0000000000..9fa88d79d8
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index e85b24a327..75604dbc69 100644
+index e85b24a32..75604dbc6 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
 @@ -60,7 +60,7 @@ public class NBTTagCompound implements NBTBase {
@@ -2722,7 +2722,7 @@ index e85b24a327..75604dbc69 100644
          return new UUID(this.getLong(s + "Most"), this.getLong(s + "Least"));
      }
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 6700582e36..3ccf166366 100644
+index 6700582e3..3ccf16636 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -159,6 +159,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -2754,7 +2754,7 @@ index 6700582e36..3ccf166366 100644
          public QueuedPacket(Packet<?> packet, @Nullable GenericFutureListener<? extends Future<? super Void>> genericfuturelistener) {
              this.a = packet;
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index 81b6f4581f..d9574a9ace 100644
+index 81b6f4581..d9574a9ac 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -33,6 +33,7 @@ public class PacketDataSerializer extends ByteBuf {
@@ -2766,7 +2766,7 @@ index 81b6f4581f..d9574a9ace 100644
          for (int j = 1; j < 5; ++j) {
              if ((i & -1 << j * 7) == 0) {
 diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java
-index 90223deae3..63c4dbd327 100644
+index 90223deae..63c4dbd32 100644
 --- a/src/main/java/net/minecraft/server/PacketEncoder.java
 +++ b/src/main/java/net/minecraft/server/PacketEncoder.java
 @@ -42,6 +42,7 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
@@ -2778,7 +2778,7 @@ index 90223deae3..63c4dbd327 100644
                          throw new SkipEncodeException(throwable);
                      } else {
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 677e3e5f68..3a1d0deb0d 100644
+index 677e3e5f6..3a1d0deb0 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -17,7 +17,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -2799,7 +2799,7 @@ index 677e3e5f68..3a1d0deb0d 100644
          int j = 0;
          ChunkSection[] achunksection = chunk.getSections();
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 775359146f..3093154bb7 100644
+index 5c5bf010d..c4bbee7d6 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -19,9 +19,9 @@ public class PlayerChunk {
@@ -2887,7 +2887,7 @@ index 775359146f..3093154bb7 100644
  
      public CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> getStatusFutureUnchecked(ChunkStatus chunkstatus) {
          CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> completablefuture = (CompletableFuture) this.statusFutures.get(chunkstatus.c());
-@@ -329,13 +378,27 @@ public class PlayerChunk {
+@@ -335,13 +384,27 @@ public class PlayerChunk {
  
          this.hasBeenLoaded |= flag3;
          if (!flag2 && flag3) {
@@ -2916,7 +2916,7 @@ index 775359146f..3093154bb7 100644
              this.a(((CompletableFuture<Either<Chunk, PlayerChunk.Failure>>) completablefuture).thenApply((either1) -> { // CraftBukkit - decompile error
                  playerchunkmap.getClass();
                  return either1.ifLeft(playerchunkmap::a);
-@@ -346,12 +409,24 @@ public class PlayerChunk {
+@@ -352,12 +415,24 @@ public class PlayerChunk {
          boolean flag5 = playerchunk_state1.isAtLeast(PlayerChunk.State.TICKING);
  
          if (!flag4 && flag5) {
@@ -2943,7 +2943,7 @@ index 775359146f..3093154bb7 100644
              this.tickingFuture = PlayerChunk.UNLOADED_CHUNK_FUTURE;
          }
  
-@@ -363,12 +438,24 @@ public class PlayerChunk {
+@@ -369,12 +444,24 @@ public class PlayerChunk {
                  throw (IllegalStateException) SystemUtils.c(new IllegalStateException());
              }
  
@@ -2971,7 +2971,7 @@ index 775359146f..3093154bb7 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 7ad30548e2..93d838ec2d 100644
+index 7ad30548e..93d838ec2 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -99,6 +99,35 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -3020,7 +3020,7 @@ index 7ad30548e2..93d838ec2d 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 0c496ee0a0..6a681d694e 100644
+index 0c496ee0a..6a681d694 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -67,9 +67,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -3037,7 +3037,7 @@ index 0c496ee0a0..6a681d694e 100644
      private volatile int chatThrottle;
      private static final AtomicIntegerFieldUpdater chatSpamField = AtomicIntegerFieldUpdater.newUpdater(PlayerConnection.class, "chatThrottle");
 diff --git a/src/main/java/net/minecraft/server/PlayerInventory.java b/src/main/java/net/minecraft/server/PlayerInventory.java
-index 08768a3c87..d103cfaace 100644
+index 08768a3c8..d103cfaac 100644
 --- a/src/main/java/net/minecraft/server/PlayerInventory.java
 +++ b/src/main/java/net/minecraft/server/PlayerInventory.java
 @@ -17,7 +17,7 @@ public class PlayerInventory implements IInventory, INamableTileEntity {
@@ -3050,7 +3050,7 @@ index 08768a3c87..d103cfaace 100644
      public final EntityHuman player;
      private ItemStack carried;
 diff --git a/src/main/java/net/minecraft/server/PotionUtil.java b/src/main/java/net/minecraft/server/PotionUtil.java
-index b3824898da..bf4172be52 100644
+index b3824898d..bf4172be5 100644
 --- a/src/main/java/net/minecraft/server/PotionUtil.java
 +++ b/src/main/java/net/minecraft/server/PotionUtil.java
 @@ -110,6 +110,7 @@ public class PotionUtil {
@@ -3062,7 +3062,7 @@ index b3824898da..bf4172be52 100644
          MinecraftKey minecraftkey = IRegistry.POTION.getKey(potionregistry);
  
 diff --git a/src/main/java/net/minecraft/server/ProtoChunk.java b/src/main/java/net/minecraft/server/ProtoChunk.java
-index 6e65306a27..39339fa275 100644
+index 6e65306a2..39339fa27 100644
 --- a/src/main/java/net/minecraft/server/ProtoChunk.java
 +++ b/src/main/java/net/minecraft/server/ProtoChunk.java
 @@ -80,6 +80,18 @@ public class ProtoChunk implements IChunkAccess {
@@ -3085,7 +3085,7 @@ index 6e65306a27..39339fa275 100644
      public IBlockData getType(BlockPosition blockposition) {
          int i = blockposition.getY();
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 7b6e0e86b0..187c4e0f58 100644
+index 7b6e0e86b..187c4e0f5 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -88,6 +88,7 @@ public class RegionFile implements AutoCloseable {
@@ -3097,7 +3097,7 @@ index 7b6e0e86b0..187c4e0f58 100644
      public synchronized DataInputStream a(ChunkCoordIntPair chunkcoordintpair) throws IOException {
          int i = this.getOffset(chunkcoordintpair);
 diff --git a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
-index 8c123f265e..9d0e8c2d43 100644
+index 8c123f265..9d0e8c2d4 100644
 --- a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
 +++ b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
 @@ -108,6 +108,26 @@ public class RegionLimitedWorldAccess implements GeneratorAccess {
@@ -3128,7 +3128,7 @@ index 8c123f265e..9d0e8c2d43 100644
      public IBlockData getType(BlockPosition blockposition) {
          return this.getChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4).getType(blockposition);
 diff --git a/src/main/java/net/minecraft/server/RegistryBlockID.java b/src/main/java/net/minecraft/server/RegistryBlockID.java
-index 4efcb8b595..60948afa4e 100644
+index 4efcb8b59..60948afa4 100644
 --- a/src/main/java/net/minecraft/server/RegistryBlockID.java
 +++ b/src/main/java/net/minecraft/server/RegistryBlockID.java
 @@ -57,6 +57,7 @@ public class RegistryBlockID<T> implements Registry<T> {
@@ -3140,7 +3140,7 @@ index 4efcb8b595..60948afa4e 100644
          return this.b.size();
      }
 diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java
-index 7b92ecfff9..7e224ebeff 100644
+index 7b92ecfff..7e224ebef 100644
 --- a/src/main/java/net/minecraft/server/SystemUtils.java
 +++ b/src/main/java/net/minecraft/server/SystemUtils.java
 @@ -58,7 +58,7 @@ public class SystemUtils {
@@ -3153,7 +3153,7 @@ index 7b92ecfff9..7e224ebeff 100644
  
      public static long getTimeMillis() {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f0deeb3d28..304dfac061 100644
+index f0deeb3d2..304dfac06 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -22,6 +22,7 @@ import org.bukkit.craftbukkit.SpigotTimings; // Spigot
@@ -3217,7 +3217,7 @@ index f0deeb3d28..304dfac061 100644
  
          return this.setTypeAndData(blockposition, fluid.getBlockData(), 3 | (flag ? 64 : 0));
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index d5014abc9d..8a5ac6f69b 100644
+index d5014abc9..8a5ac6f69 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -973,6 +973,7 @@ public class WorldServer extends World {
@@ -3237,7 +3237,7 @@ index d5014abc9d..8a5ac6f69b 100644
  
          this.getScoreboard().a(entity);
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index e181df6f4d..4a9132c701 100644
+index e181df6f4..4a9132c70 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -85,6 +85,7 @@ public final class CraftItemStack extends ItemStack {
@@ -3249,7 +3249,7 @@ index e181df6f4d..4a9132c701 100644
      /**
       * Mirror
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
-index d8358a0f03..d0b813008c 100644
+index d8358a0f0..d0b813008 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/DummyGeneratorAccess.java
 @@ -196,4 +196,22 @@ public class DummyGeneratorAccess implements GeneratorAccess {
@@ -3276,7 +3276,7 @@ index d8358a0f03..d0b813008c 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java b/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java
-index 1aec70a1f1..f72c13beda 100644
+index 1aec70a1f..f72c13bed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/UnsafeList.java
 @@ -17,7 +17,7 @@ import java.util.RandomAccess;

Spigot-Server-Patches/0381-incremental-chunk-saving.patch

@@ -1,4 +1,4 @@
-From c77a745952015ee72adcb90b58458b05cdfaaf8f Mon Sep 17 00:00:00 2001
+From 69a4d617a38b343cbc9b135e60f6a68e7db8ccee Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 9 Jun 2019 03:53:22 +0100
 Subject: [PATCH] incremental chunk saving
@@ -42,7 +42,7 @@ index 3882e5b2a..4d300699f 100644
      private long inhabitedTime;
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index bedf47b78..7bbcc8cd7 100644
+index 928e01c07..500e6289c 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -434,6 +434,15 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -108,7 +108,7 @@ index eaa26e1a5..6fa08c60b 100644
          this.methodProfiler.enter("snooper");
          if (((DedicatedServer) this).getDedicatedServerProperties().snooperEnabled && !this.snooper.d() && this.ticks > 100) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 3a0f0314b..c91312fac 100644
+index b6d387006..66a389a67 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -40,6 +40,9 @@ public class PlayerChunk {
@@ -121,7 +121,7 @@ index 3a0f0314b..c91312fac 100644
      public PlayerChunk(ChunkCoordIntPair chunkcoordintpair, int i, LightEngine lightengine, PlayerChunk.c playerchunk_c, PlayerChunk.d playerchunk_d) {
          this.statusFutures = new AtomicReferenceArray(PlayerChunk.CHUNK_STATUSES.size());
          this.fullChunkFuture = PlayerChunk.UNLOADED_CHUNK_FUTURE;
-@@ -376,7 +379,19 @@ public class PlayerChunk {
+@@ -382,7 +385,19 @@ public class PlayerChunk {
          boolean flag2 = playerchunk_state.isAtLeast(PlayerChunk.State.BORDER);
          boolean flag3 = playerchunk_state1.isAtLeast(PlayerChunk.State.BORDER);
  
@@ -141,7 +141,7 @@ index 3a0f0314b..c91312fac 100644
          if (!flag2 && flag3) {
              // Paper start - cache ticking ready status
              int expectCreateCount = ++this.fullChunkCreateCount;
-@@ -490,8 +505,32 @@ public class PlayerChunk {
+@@ -502,8 +517,32 @@ public class PlayerChunk {
      }
  
      public void m() {
@@ -175,7 +175,7 @@ index 3a0f0314b..c91312fac 100644
      public void a(ProtoChunkExtension protochunkextension) {
          for (int i = 0; i < this.statusFutures.length(); ++i) {
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 999f0bb43..a46d4661d 100644
+index 7033d3a91..5c28ccc00 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -331,6 +331,64 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {

Spigot-Server-Patches/0393-Asynchronous-chunk-IO-and-loading.patch

@@ -1,4 +1,4 @@
-From eaec5bfc7161e0448b6c9ac2d7b4a924338c771c Mon Sep 17 00:00:00 2001
+From 0db490e14e4a9fc3a85019edc67822926ecf9589 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 13 Jul 2019 09:23:10 -0700
 Subject: [PATCH] Asynchronous chunk IO and loading
@@ -121,7 +121,7 @@ tasks required to be executed by the chunk load task (i.e lighting
 and some poi tasks).
 
 diff --git a/src/main/java/co/aikar/timings/WorldTimingsHandler.java b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
-index e41083f14c..8a3f30c36f 100644
+index e41083f14..8a3f30c36 100644
 --- a/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 +++ b/src/main/java/co/aikar/timings/WorldTimingsHandler.java
 @@ -62,6 +62,17 @@ public class WorldTimingsHandler {
@@ -161,7 +161,7 @@ index e41083f14c..8a3f30c36f 100644
  
      public static Timing getTickList(WorldServer worldserver, String timingsType) {
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 546a1cfe0a..1d7d1ffbf7 100644
+index 546a1cfe0..1d7d1ffbf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
@@ -237,7 +237,7 @@ index 546a1cfe0a..1d7d1ffbf7 100644
 +    }
  }
 diff --git a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
-index 23626bef3a..1edcecd2ee 100644
+index 23626bef3..1edcecd2e 100644
 --- a/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
 +++ b/src/main/java/com/destroystokyo/paper/antixray/ChunkPacketBlockControllerAntiXray.java
 @@ -9,6 +9,7 @@ import java.util.concurrent.Executors;
@@ -318,7 +318,7 @@ index 23626bef3a..1edcecd2ee 100644
  
 diff --git a/src/main/java/com/destroystokyo/paper/io/IOUtil.java b/src/main/java/com/destroystokyo/paper/io/IOUtil.java
 new file mode 100644
-index 0000000000..5af0ac3d9e
+index 000000000..5af0ac3d9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/IOUtil.java
 @@ -0,0 +1,62 @@
@@ -386,7 +386,7 @@ index 0000000000..5af0ac3d9e
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/io/PaperFileIOThread.java b/src/main/java/com/destroystokyo/paper/io/PaperFileIOThread.java
 new file mode 100644
-index 0000000000..4f10a8311e
+index 000000000..4f10a8311
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/PaperFileIOThread.java
 @@ -0,0 +1,661 @@
@@ -1053,7 +1053,7 @@ index 0000000000..4f10a8311e
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/io/PrioritizedTaskQueue.java b/src/main/java/com/destroystokyo/paper/io/PrioritizedTaskQueue.java
 new file mode 100644
-index 0000000000..78bd238f4c
+index 000000000..78bd238f4
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/PrioritizedTaskQueue.java
 @@ -0,0 +1,276 @@
@@ -1335,7 +1335,7 @@ index 0000000000..78bd238f4c
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/io/QueueExecutorThread.java b/src/main/java/com/destroystokyo/paper/io/QueueExecutorThread.java
 new file mode 100644
-index 0000000000..ee906b594b
+index 000000000..ee906b594
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/QueueExecutorThread.java
 @@ -0,0 +1,241 @@
@@ -1582,7 +1582,7 @@ index 0000000000..ee906b594b
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java
 new file mode 100644
-index 0000000000..305da47868
+index 000000000..305da4786
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkLoadTask.java
 @@ -0,0 +1,149 @@
@@ -1737,7 +1737,7 @@ index 0000000000..305da47868
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkSaveTask.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkSaveTask.java
 new file mode 100644
-index 0000000000..60312b85f9
+index 000000000..60312b85f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkSaveTask.java
 @@ -0,0 +1,112 @@
@@ -1855,7 +1855,7 @@ index 0000000000..60312b85f9
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTask.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTask.java
 new file mode 100644
-index 0000000000..1dfa8abfd8
+index 000000000..1dfa8abfd
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTask.java
 @@ -0,0 +1,40 @@
@@ -1901,7 +1901,7 @@ index 0000000000..1dfa8abfd8
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java
 new file mode 100644
-index 0000000000..715a2dd8d2
+index 000000000..715a2dd8d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/io/chunk/ChunkTaskManager.java
 @@ -0,0 +1,455 @@
@@ -2361,7 +2361,7 @@ index 0000000000..715a2dd8d2
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index a57371b08e..e8166bc812 100644
+index a57371b08..e8166bc81 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -218,11 +218,137 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -2531,7 +2531,7 @@ index a57371b08e..e8166bc812 100644
          } finally {
              playerChunkMap.callbackExecutor.run();
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index a950ad801d..26f1a4b095 100644
+index a950ad801..26f1a4b09 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -6,6 +6,7 @@ import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
@@ -2800,7 +2800,7 @@ index a950ad801d..26f1a4b095 100644
  
          nbttagcompound1.set("PostProcessing", a(ichunkaccess.l()));
 diff --git a/src/main/java/net/minecraft/server/ChunkStatus.java b/src/main/java/net/minecraft/server/ChunkStatus.java
-index 134a4f0b7d..88f1674616 100644
+index 134a4f0b7..88f167461 100644
 --- a/src/main/java/net/minecraft/server/ChunkStatus.java
 +++ b/src/main/java/net/minecraft/server/ChunkStatus.java
 @@ -153,6 +153,7 @@ public class ChunkStatus {
@@ -2812,7 +2812,7 @@ index 134a4f0b7d..88f1674616 100644
          return ChunkStatus.r.getInt(chunkstatus.c());
      }
 diff --git a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
-index 7e5ece9d50..cfe43e882e 100644
+index 7e5ece9d5..cfe43e882 100644
 --- a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
 +++ b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
 @@ -91,7 +91,7 @@ public abstract class IAsyncTaskHandler<R extends Runnable> implements Mailbox<R
@@ -2825,7 +2825,7 @@ index 7e5ece9d50..cfe43e882e 100644
              ;
          }
 diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java
-index 2f95174fcc..134c76065b 100644
+index 2f95174fc..134c76065 100644
 --- a/src/main/java/net/minecraft/server/IChunkLoader.java
 +++ b/src/main/java/net/minecraft/server/IChunkLoader.java
 @@ -3,37 +3,49 @@ package net.minecraft.server;
@@ -2950,7 +2950,7 @@ index 2f95174fcc..134c76065b 100644
 +//    Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index b6aeca05f7..bcd5cc9f28 100644
+index b6aeca05f..bcd5cc9f2 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -600,4 +600,9 @@ public final class MCUtil {
@@ -2964,7 +2964,7 @@ index b6aeca05f7..bcd5cc9f28 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6fa08c60bd..baeaf772be 100644
+index 6fa08c60b..baeaf772b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -789,6 +789,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -2976,7 +2976,7 @@ index 6fa08c60bd..baeaf772be 100644
  
      public String getServerIp() {
 diff --git a/src/main/java/net/minecraft/server/NextTickListEntry.java b/src/main/java/net/minecraft/server/NextTickListEntry.java
-index e9c405fb53..33cfeabdee 100644
+index e9c405fb5..33cfeabde 100644
 --- a/src/main/java/net/minecraft/server/NextTickListEntry.java
 +++ b/src/main/java/net/minecraft/server/NextTickListEntry.java
 @@ -4,7 +4,7 @@ import java.util.Comparator;
@@ -2998,7 +2998,7 @@ index e9c405fb53..33cfeabdee 100644
          this.e = t0;
          this.b = i;
 diff --git a/src/main/java/net/minecraft/server/NibbleArray.java b/src/main/java/net/minecraft/server/NibbleArray.java
-index ed8c4a87b5..996c832638 100644
+index ed8c4a87b..996c83263 100644
 --- a/src/main/java/net/minecraft/server/NibbleArray.java
 +++ b/src/main/java/net/minecraft/server/NibbleArray.java
 @@ -71,6 +71,7 @@ public class NibbleArray {
@@ -3010,7 +3010,7 @@ index ed8c4a87b5..996c832638 100644
          return this.a == null ? new NibbleArray() : new NibbleArray((byte[]) this.a.clone());
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index b556a8fefa..b82ea26eb6 100644
+index 50135446f..b38bc6775 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -127,6 +127,18 @@ public class PlayerChunk {
@@ -3041,7 +3041,7 @@ index b556a8fefa..b82ea26eb6 100644
          PlayerChunk.State playerchunk_state = getChunkState(this.oldTicketLevel);
          PlayerChunk.State playerchunk_state1 = getChunkState(this.ticketLevel);
          // CraftBukkit start
-@@ -384,6 +396,12 @@ public class PlayerChunk {
+@@ -390,6 +402,12 @@ public class PlayerChunk {
                  }
              });
  
@@ -3055,7 +3055,7 @@ index b556a8fefa..b82ea26eb6 100644
                  completablefuture = (CompletableFuture) this.statusFutures.get(i);
                  if (completablefuture != null) {
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 5ef1aedbed..a3271d6c28 100644
+index 5ef1aedbe..a3271d6c2 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -63,7 +63,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -3546,7 +3546,7 @@ index 5ef1aedbed..a3271d6c28 100644
          return this.m;
      }
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index d37abf2cf3..df728e2c0a 100644
+index d37abf2cf..df728e2c0 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -36,6 +36,8 @@ public class RegionFile implements AutoCloseable {
@@ -3591,7 +3591,7 @@ index d37abf2cf3..df728e2c0a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index e07ae98540..0f201000f6 100644
+index e07ae9854..0f201000f 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -9,7 +9,7 @@ import java.io.File;
@@ -3696,7 +3696,7 @@ index e07ae98540..0f201000f6 100644
  
          return regionfile != null ? regionfile.chunkExists(pos) : false;
 diff --git a/src/main/java/net/minecraft/server/RegionFileSection.java b/src/main/java/net/minecraft/server/RegionFileSection.java
-index db9f0196bd..a6d8ef5eb4 100644
+index db9f0196b..a6d8ef5eb 100644
 --- a/src/main/java/net/minecraft/server/RegionFileSection.java
 +++ b/src/main/java/net/minecraft/server/RegionFileSection.java
 @@ -20,28 +20,29 @@ import javax.annotation.Nullable;
@@ -3832,7 +3832,7 @@ index db9f0196bd..a6d8ef5eb4 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/TicketType.java b/src/main/java/net/minecraft/server/TicketType.java
-index 1d1b267f32..4b87ca2ecb 100644
+index 1d1b267f3..4b87ca2ec 100644
 --- a/src/main/java/net/minecraft/server/TicketType.java
 +++ b/src/main/java/net/minecraft/server/TicketType.java
 @@ -22,6 +22,7 @@ public class TicketType<T> {
@@ -3844,7 +3844,7 @@ index 1d1b267f32..4b87ca2ecb 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/VillagePlace.java b/src/main/java/net/minecraft/server/VillagePlace.java
-index c999f8c9bf..b59ef1a633 100644
+index c999f8c9b..b59ef1a63 100644
 --- a/src/main/java/net/minecraft/server/VillagePlace.java
 +++ b/src/main/java/net/minecraft/server/VillagePlace.java
 @@ -24,8 +24,16 @@ public class VillagePlace extends RegionFileSection<VillagePlaceSection> {
@@ -3933,7 +3933,7 @@ index c999f8c9bf..b59ef1a633 100644
  
          HAS_SPACE(VillagePlaceRecord::d), IS_OCCUPIED(VillagePlaceRecord::e), ANY((villageplacerecord) -> {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 27dcc25284..6506daeecd 100644
+index 27dcc2528..6506daeec 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -82,6 +82,79 @@ public class WorldServer extends World {
@@ -4026,7 +4026,7 @@ index 27dcc25284..6506daeecd 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 6204a22071..95a29d1b29 100644
+index 6204a2207..95a29d1b2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -550,22 +550,23 @@ public class CraftWorld implements World {
@@ -4088,7 +4088,7 @@ index 6204a22071..95a29d1b29 100644
      @Override
      public int getViewDistance() {
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 07936eeba2..5bdcdcf9e8 100644
+index 07936eeba..5bdcdcf9e 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -6,6 +6,7 @@ import java.lang.management.ThreadInfo;

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 13ed05decd13b6947473ca4926ee53d7705e2965
+Subproject commit 7f61a2526eab7818682ea0761e54f35f80cd2d6a