Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly

Paper Changes:
ad708dd3 Add option to allow iron golems to spawn in air (Closes #1965, Closes #1851)
b16fd5c3 Updated Upstream (Bukkit/CraftBukkit/Spigot)

patches/server/0002-Tuinity-Server-Patches.patch

@@ -1,4 +1,4 @@
-From 9795b9171b86f82f9091f6c2325f312d980bd696 Mon Sep 17 00:00:00 2001
+From 4ad6d822049616c83833585f1a24cbe87500128a Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Fri, 14 Dec 2018 21:53:58 -0800
 Subject: [PATCH] Tuinity Server Patches
@@ -128,7 +128,7 @@ Subject: [PATCH] Tuinity Server Patches
  create mode 100644 src/main/java/com/tuinity/tuinity/util/set/LinkedSortedSet.java
 
 diff --git a/pom.xml b/pom.xml
-index e6fc4d014..ffac75de2 100644
+index e6fc4d014e..ffac75de25 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,4 +1,4 @@
@@ -173,7 +173,7 @@ index e6fc4d014..ffac75de2 100644
                      <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
                      <dependency>
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index 132397b3f..4e12f416f 100644
+index 132397b3f3..4e12f416f9 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -215,7 +215,7 @@ public class PaperCommand extends Command {
@@ -186,7 +186,7 @@ index 132397b3f..4e12f416f 100644
                      continue;
                  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7d408542e..a61d936fc 100644
+index c7cde1d0a0..e60af9ceba 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -108,7 +108,7 @@ public class PaperWorldConfig {
@@ -207,7 +207,7 @@ index 7d408542e..a61d936fc 100644
          softDespawnDistance = softDespawnDistance*softDespawnDistance;
          hardDespawnDistance = hardDespawnDistance*hardDespawnDistance;
 diff --git a/src/main/java/com/destroystokyo/paper/io/PrioritizedTaskQueue.java b/src/main/java/com/destroystokyo/paper/io/PrioritizedTaskQueue.java
-index 78bd238f4..8a7893268 100644
+index 78bd238f4c..8a78932688 100644
 --- a/src/main/java/com/destroystokyo/paper/io/PrioritizedTaskQueue.java
 +++ b/src/main/java/com/destroystokyo/paper/io/PrioritizedTaskQueue.java
 @@ -1,5 +1,6 @@
@@ -277,7 +277,7 @@ index 78bd238f4..8a7893268 100644
      }
  
 diff --git a/src/main/java/com/mojang/datafixers/util/Either.java b/src/main/java/com/mojang/datafixers/util/Either.java
-index a90adac7b..2e7cbf8bf 100644
+index a90adac7bd..2e7cbf8bf5 100644
 --- a/src/main/java/com/mojang/datafixers/util/Either.java
 +++ b/src/main/java/com/mojang/datafixers/util/Either.java
 @@ -23,6 +23,7 @@ public abstract class Either<L, R> implements App<Either.Mu<R>, L> {
@@ -316,7 +316,7 @@ index a90adac7b..2e7cbf8bf 100644
          @Override
 diff --git a/src/main/java/com/tuinity/tuinity/chunk/ChunkRegionManager.java b/src/main/java/com/tuinity/tuinity/chunk/ChunkRegionManager.java
 new file mode 100644
-index 000000000..ff17a100b
+index 0000000000..ff17a100ba
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/chunk/ChunkRegionManager.java
 @@ -0,0 +1,165 @@
@@ -488,7 +488,7 @@ index 000000000..ff17a100b
 \ No newline at end of file
 diff --git a/src/main/java/com/tuinity/tuinity/chunk/QueuedChangesMapLong2Int.java b/src/main/java/com/tuinity/tuinity/chunk/QueuedChangesMapLong2Int.java
 new file mode 100644
-index 000000000..d528d08ea
+index 0000000000..d528d08ea5
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/chunk/QueuedChangesMapLong2Int.java
 @@ -0,0 +1,155 @@
@@ -649,7 +649,7 @@ index 000000000..d528d08ea
 +}
 diff --git a/src/main/java/com/tuinity/tuinity/chunk/QueuedChangesMapLong2Object.java b/src/main/java/com/tuinity/tuinity/chunk/QueuedChangesMapLong2Object.java
 new file mode 100644
-index 000000000..e5bb56cca
+index 0000000000..e5bb56cca9
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/chunk/QueuedChangesMapLong2Object.java
 @@ -0,0 +1,170 @@
@@ -826,7 +826,7 @@ index 000000000..e5bb56cca
 \ 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 000000000..feec44f57
+index 0000000000..feec44f572
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/config/TuinityConfig.java
 @@ -0,0 +1,225 @@
@@ -1058,7 +1058,7 @@ index 000000000..feec44f57
 \ No newline at end of file
 diff --git a/src/main/java/com/tuinity/tuinity/server/TickListServerInterval.java b/src/main/java/com/tuinity/tuinity/server/TickListServerInterval.java
 new file mode 100644
-index 000000000..bef788ccf
+index 0000000000..bef788ccfa
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/server/TickListServerInterval.java
 @@ -0,0 +1,42 @@
@@ -1106,7 +1106,7 @@ index 000000000..bef788ccf
 +}
 diff --git a/src/main/java/com/tuinity/tuinity/server/TuinityTickList.java b/src/main/java/com/tuinity/tuinity/server/TuinityTickList.java
 new file mode 100644
-index 000000000..4118dd7e1
+index 0000000000..4118dd7e1d
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/server/TuinityTickList.java
 @@ -0,0 +1,614 @@
@@ -1726,7 +1726,7 @@ index 000000000..4118dd7e1
 +}
 diff --git a/src/main/java/com/tuinity/tuinity/util/ChunkList.java b/src/main/java/com/tuinity/tuinity/util/ChunkList.java
 new file mode 100644
-index 000000000..66c64be8f
+index 0000000000..66c64be8f3
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/util/ChunkList.java
 @@ -0,0 +1,119 @@
@@ -1851,7 +1851,7 @@ index 000000000..66c64be8f
 +}
 diff --git a/src/main/java/com/tuinity/tuinity/util/EntityList.java b/src/main/java/com/tuinity/tuinity/util/EntityList.java
 new file mode 100644
-index 000000000..570c44e26
+index 0000000000..570c44e26a
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/util/EntityList.java
 @@ -0,0 +1,124 @@
@@ -1981,7 +1981,7 @@ index 000000000..570c44e26
 +}
 diff --git a/src/main/java/com/tuinity/tuinity/util/IBlockDataList.java b/src/main/java/com/tuinity/tuinity/util/IBlockDataList.java
 new file mode 100644
-index 000000000..ce15ce532
+index 0000000000..ce15ce532b
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/util/IBlockDataList.java
 @@ -0,0 +1,123 @@
@@ -2111,7 +2111,7 @@ index 000000000..ce15ce532
 \ No newline at end of file
 diff --git a/src/main/java/com/tuinity/tuinity/util/OptimizedSmallEnumSet.java b/src/main/java/com/tuinity/tuinity/util/OptimizedSmallEnumSet.java
 new file mode 100644
-index 000000000..934792ad3
+index 0000000000..934792ad39
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/util/OptimizedSmallEnumSet.java
 @@ -0,0 +1,65 @@
@@ -2183,7 +2183,7 @@ index 000000000..934792ad3
 \ No newline at end of file
 diff --git a/src/main/java/com/tuinity/tuinity/util/PrimaryThreadList.java b/src/main/java/com/tuinity/tuinity/util/PrimaryThreadList.java
 new file mode 100644
-index 000000000..de930aef9
+index 0000000000..de930aef9b
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/util/PrimaryThreadList.java
 @@ -0,0 +1,241 @@
@@ -2431,7 +2431,7 @@ index 000000000..de930aef9
 \ No newline at end of file
 diff --git a/src/main/java/com/tuinity/tuinity/util/PrimaryThreadSet.java b/src/main/java/com/tuinity/tuinity/util/PrimaryThreadSet.java
 new file mode 100644
-index 000000000..0249c78c1
+index 0000000000..0249c78c1a
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/util/PrimaryThreadSet.java
 @@ -0,0 +1,282 @@
@@ -2719,7 +2719,7 @@ index 000000000..0249c78c1
 +}
 diff --git a/src/main/java/com/tuinity/tuinity/util/TickSynchronizationPoint.java b/src/main/java/com/tuinity/tuinity/util/TickSynchronizationPoint.java
 new file mode 100644
-index 000000000..37adae900
+index 0000000000..37adae9007
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/util/TickSynchronizationPoint.java
 @@ -0,0 +1,40 @@
@@ -2766,7 +2766,7 @@ index 000000000..37adae900
 \ No newline at end of file
 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 000000000..d5688a734
+index 0000000000..d5688a734e
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/util/TickThread.java
 @@ -0,0 +1,40 @@
@@ -2813,7 +2813,7 @@ index 000000000..d5688a734
 \ No newline at end of file
 diff --git a/src/main/java/com/tuinity/tuinity/util/Util.java b/src/main/java/com/tuinity/tuinity/util/Util.java
 new file mode 100644
-index 000000000..a69fc1488
+index 0000000000..a69fc14880
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/util/Util.java
 @@ -0,0 +1,103 @@
@@ -2922,7 +2922,7 @@ index 000000000..a69fc1488
 +}
 diff --git a/src/main/java/com/tuinity/tuinity/util/fastutil/ExtendedAbstractDoubleList.java b/src/main/java/com/tuinity/tuinity/util/fastutil/ExtendedAbstractDoubleList.java
 new file mode 100644
-index 000000000..88b198fd7
+index 0000000000..88b198fd7b
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/util/fastutil/ExtendedAbstractDoubleList.java
 @@ -0,0 +1,39 @@
@@ -2968,7 +2968,7 @@ index 000000000..88b198fd7
 \ No newline at end of file
 diff --git a/src/main/java/com/tuinity/tuinity/util/fastutil/ExtendedDoubleArrayList.java b/src/main/java/com/tuinity/tuinity/util/fastutil/ExtendedDoubleArrayList.java
 new file mode 100644
-index 000000000..36457981e
+index 0000000000..36457981ee
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/util/fastutil/ExtendedDoubleArrayList.java
 @@ -0,0 +1,65 @@
@@ -3039,7 +3039,7 @@ index 000000000..36457981e
 +}
 diff --git a/src/main/java/com/tuinity/tuinity/util/fastutil/ExtendedObjectAVLTreeSet.java b/src/main/java/com/tuinity/tuinity/util/fastutil/ExtendedObjectAVLTreeSet.java
 new file mode 100644
-index 000000000..1a3f59633
+index 0000000000..1a3f596330
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/util/fastutil/ExtendedObjectAVLTreeSet.java
 @@ -0,0 +1,90 @@
@@ -3135,7 +3135,7 @@ index 000000000..1a3f59633
 +}
 diff --git a/src/main/java/com/tuinity/tuinity/util/map/AreaMap.java b/src/main/java/com/tuinity/tuinity/util/map/AreaMap.java
 new file mode 100644
-index 000000000..dfb7a417e
+index 0000000000..dfb7a417ea
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/util/map/AreaMap.java
 @@ -0,0 +1,388 @@
@@ -3530,7 +3530,7 @@ index 000000000..dfb7a417e
 \ No newline at end of file
 diff --git a/src/main/java/com/tuinity/tuinity/util/map/PlayerAreaMap.java b/src/main/java/com/tuinity/tuinity/util/map/PlayerAreaMap.java
 new file mode 100644
-index 000000000..a29fdcbbc
+index 0000000000..a29fdcbbcb
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/util/map/PlayerAreaMap.java
 @@ -0,0 +1,25 @@
@@ -3562,7 +3562,7 @@ index 000000000..a29fdcbbc
 \ No newline at end of file
 diff --git a/src/main/java/com/tuinity/tuinity/util/map/PooledLinkedHashSets.java b/src/main/java/com/tuinity/tuinity/util/map/PooledLinkedHashSets.java
 new file mode 100644
-index 000000000..cf888454c
+index 0000000000..cf888454c1
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/util/map/PooledLinkedHashSets.java
 @@ -0,0 +1,287 @@
@@ -3856,7 +3856,7 @@ index 000000000..cf888454c
 \ No newline at end of file
 diff --git a/src/main/java/com/tuinity/tuinity/util/pool/PooledBlockPositions.java b/src/main/java/com/tuinity/tuinity/util/pool/PooledBlockPositions.java
 new file mode 100644
-index 000000000..815974682
+index 0000000000..815974682a
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/util/pool/PooledBlockPositions.java
 @@ -0,0 +1,40 @@
@@ -3902,7 +3902,7 @@ index 000000000..815974682
 +}
 diff --git a/src/main/java/com/tuinity/tuinity/util/set/LinkedSortedSet.java b/src/main/java/com/tuinity/tuinity/util/set/LinkedSortedSet.java
 new file mode 100644
-index 000000000..c726ef3c2
+index 0000000000..c726ef3c2b
 --- /dev/null
 +++ b/src/main/java/com/tuinity/tuinity/util/set/LinkedSortedSet.java
 @@ -0,0 +1,142 @@
@@ -4049,7 +4049,7 @@ index 000000000..c726ef3c2
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/ArraySetSorted.java b/src/main/java/net/minecraft/server/ArraySetSorted.java
-index 85f799a71..5fa6f75e2 100644
+index 85f799a713..5fa6f75e2e 100644
 --- a/src/main/java/net/minecraft/server/ArraySetSorted.java
 +++ b/src/main/java/net/minecraft/server/ArraySetSorted.java
 @@ -6,12 +6,13 @@ import java.util.Arrays;
@@ -4112,7 +4112,7 @@ index 85f799a71..5fa6f75e2 100644
          return new ArraySetSorted<>(i, (Comparator)Comparator.naturalOrder()); // Paper - decompile fix
      }
 diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
-index c950139c0..1a3234bb4 100644
+index c950139c0f..1a3234bb47 100644
 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
 +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
 @@ -193,6 +193,7 @@ public class AxisAlignedBB {
@@ -4132,7 +4132,7 @@ index c950139c0..1a3234bb4 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/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index e650a2e48..83c5c8329 100644
+index e650a2e48d..83c5c83292 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -125,6 +125,7 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
@@ -4144,7 +4144,7 @@ index e650a2e48..83c5c8329 100644
          return this.b(baseblockposition.getX(), baseblockposition.getY(), baseblockposition.getZ());
      }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 92065fe02..cd7ada615 100644
+index 92065fe029..cd7ada6159 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -162,6 +162,94 @@ public class Chunk implements IChunkAccess {
@@ -4345,7 +4345,7 @@ index 92065fe02..cd7ada615 100644
          int j = MathHelper.floor((axisalignedbb.maxY + 2.0D) / 16.0D);
  
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index 55f9f4e6e..d3c616e72 100644
+index 55f9f4e6e7..d3c616e72d 100644
 --- a/src/main/java/net/minecraft/server/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/ChunkMap.java
 @@ -13,9 +13,10 @@ public abstract class ChunkMap extends LightEngineGraph {
@@ -4385,7 +4385,7 @@ index 55f9f4e6e..d3c616e72 100644
          this.a(ChunkCoordIntPair.a, i, j, flag);
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
-index 73d157076..cb2e67d15 100644
+index 73d1570765..cb2e67d159 100644
 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
 +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
 @@ -1,5 +1,6 @@
@@ -4916,7 +4916,7 @@ index 73d157076..cb2e67d15 100644
  
          protected b(int i) {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 76c7f4a50..516f27fd2 100644
+index cf9021d605..239e646e9b 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -119,6 +119,12 @@ public class ChunkProviderServer extends IChunkProvider {
@@ -5105,7 +5105,7 @@ index 76c7f4a50..516f27fd2 100644
              this.world.getMethodProfiler().enter("pollingChunks");
              int k = this.world.getGameRules().getInt(GameRules.RANDOM_TICK_SPEED);
              BlockPosition blockposition = this.world.getSpawn();
-@@ -630,11 +719,10 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -636,11 +725,10 @@ public class ChunkProviderServer extends IChunkProvider {
              EnumCreatureType[] aenumcreaturetype = EnumCreatureType.values();
              // Paper start - per player mob spawning
              int[] worldMobCount;
@@ -5120,7 +5120,7 @@ index 76c7f4a50..516f27fd2 100644
                  // re-set mob counts
                  for (EntityPlayer player : this.world.players) {
                      Arrays.fill(player.mobCounts, 0);
-@@ -647,20 +735,13 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -653,20 +741,13 @@ public class ChunkProviderServer extends IChunkProvider {
  
              this.world.timings.countNaturalMobs.stopTiming(); // Paper - timings
              this.world.getMethodProfiler().exit();
@@ -5148,7 +5148,7 @@ index 76c7f4a50..516f27fd2 100644
  
                      this.world.getMethodProfiler().enter("broadcast");
                      this.world.timings.broadcastChunkUpdates.startTiming(); // Paper - timings
-@@ -670,10 +751,10 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -676,10 +757,10 @@ public class ChunkProviderServer extends IChunkProvider {
                      ChunkCoordIntPair chunkcoordintpair = playerchunk.i();
  
                      this.world.timings.chunkInhibitedRangeCheck.startTiming();
@@ -5161,7 +5161,7 @@ index 76c7f4a50..516f27fd2 100644
                              this.world.getMethodProfiler().enter("spawner");
                              this.world.timings.mobSpawn.startTiming(); // Spigot
                              EnumCreatureType[] aenumcreaturetype1 = aenumcreaturetype;
-@@ -713,9 +794,23 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -724,9 +805,23 @@ public class ChunkProviderServer extends IChunkProvider {
  
                                      if (this.world.paperConfig.perPlayerMobSpawns) {
                                          int minDiff = Integer.MAX_VALUE;
@@ -5186,7 +5186,7 @@ index 76c7f4a50..516f27fd2 100644
                                          difference = (minDiff == Integer.MAX_VALUE) ? 0 : minDiff;
                                      }
  
-@@ -738,7 +833,22 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -749,7 +844,22 @@ public class ChunkProviderServer extends IChunkProvider {
                      }
                      this.world.timings.chunkInhibitedRangeCheck.stopTiming(); // Paper
                  }
@@ -5211,7 +5211,7 @@ index 76c7f4a50..516f27fd2 100644
              if (flag1) {
                  try (co.aikar.timings.Timing ignored = this.world.timings.miscMobSpawning.startTiming()) { // Paper - timings
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 4349d22cc..d529b795c 100644
+index 4349d22cc8..d529b795c5 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -23,6 +23,14 @@ public class ChunkRegionLoader {
@@ -5243,7 +5243,7 @@ index 4349d22cc..d529b795c 100644
          nbttagcompound1.setString("Status", ichunkaccess.getChunkStatus().d());
          ChunkConverter chunkconverter = ichunkaccess.p();
 diff --git a/src/main/java/net/minecraft/server/ChunkStatus.java b/src/main/java/net/minecraft/server/ChunkStatus.java
-index 88f167461..fd7b10429 100644
+index 88f1674616..fd7b10429d 100644
 --- a/src/main/java/net/minecraft/server/ChunkStatus.java
 +++ b/src/main/java/net/minecraft/server/ChunkStatus.java
 @@ -103,7 +103,7 @@ public class ChunkStatus {
@@ -5273,7 +5273,7 @@ index 88f167461..fd7b10429 100644
          return this.c() >= chunkstatus.c();
      }
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 349a0ea21..ede436939 100644
+index 349a0ea213..ede4369399 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -44,7 +44,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -5294,7 +5294,7 @@ index 349a0ea21..ede436939 100644
          this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals);
          this.setSpawnNPCs(dedicatedserverproperties.spawnNpcs);
 diff --git a/src/main/java/net/minecraft/server/DoubleListOffset.java b/src/main/java/net/minecraft/server/DoubleListOffset.java
-index 73657f740..9ff09b02d 100644
+index 73657f7407..9ff09b02d6 100644
 --- a/src/main/java/net/minecraft/server/DoubleListOffset.java
 +++ b/src/main/java/net/minecraft/server/DoubleListOffset.java
 @@ -3,7 +3,7 @@ package net.minecraft.server;
@@ -5307,7 +5307,7 @@ index 73657f740..9ff09b02d 100644
      private final DoubleList a;
      private final double b;
 diff --git a/src/main/java/net/minecraft/server/EULA.java b/src/main/java/net/minecraft/server/EULA.java
-index cf00f35a5..e54730f09 100644
+index cf00f35a5b..e54730f097 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 {
@@ -5320,7 +5320,7 @@ index cf00f35a5..e54730f09 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 8974c16bf..23e91183e 100644
+index 8974c16bf9..23e91183ef 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -208,6 +208,58 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -5391,7 +5391,7 @@ index 8974c16bf..23e91183e 100644
          double d3 = this.locX() - d0;
          double d4 = this.locY() - d1;
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index af10fc36e..bf14d33c0 100644
+index af10fc36e0..bf14d33c0d 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -579,9 +579,9 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -5407,7 +5407,7 @@ index af10fc36e..bf14d33c0 100644
                      double deltaX = this.locX() - player.locX();
                      double deltaZ = this.locZ() - player.locZ();
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 1991cee43..27ef47600 100644
+index 1991cee43d..27ef476001 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -641,20 +641,27 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -5445,7 +5445,7 @@ index 1991cee43..27ef47600 100644
  
          } else {
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index e7bfbc330..937e513d8 100644
+index e7bfbc3307..937e513d81 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -104,6 +104,37 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -5512,7 +5512,7 @@ index e7bfbc330..937e513d8 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 3a88c9a67..b4d3c4a4f 100644
+index 3a88c9a670..b4d3c4a4f9 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -18,7 +18,7 @@ import org.bukkit.event.player.PlayerVelocityEvent;
@@ -5619,7 +5619,7 @@ index 3a88c9a67..b4d3c4a4f 100644
          this.xLoc = PacketPlayOutEntity.a(this.tracker.locX());
          this.yLoc = PacketPlayOutEntity.a(this.tracker.locY());
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index 8977c3516..bace6cf36 100644
+index 8977c3516b..bace6cf36a 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
 @@ -208,9 +208,9 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@@ -5635,7 +5635,7 @@ index 8977c3516..bace6cf36 100644
                      double deltaX = this.locX() - player.locX();
                      double deltaZ = this.locZ() - player.locZ();
 diff --git a/src/main/java/net/minecraft/server/HeightMap.java b/src/main/java/net/minecraft/server/HeightMap.java
-index 29cb545a8..aa7339610 100644
+index 29cb545a86..aa73396100 100644
 --- a/src/main/java/net/minecraft/server/HeightMap.java
 +++ b/src/main/java/net/minecraft/server/HeightMap.java
 @@ -119,6 +119,7 @@ public class HeightMap {
@@ -5665,7 +5665,7 @@ index 29cb545a8..aa7339610 100644
              this.h = heightmap_use;
              this.i = predicate;
 diff --git a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
-index cfe43e882..e7a58989d 100644
+index cfe43e882e..e7a58989dd 100644
 --- a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
 +++ b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
 @@ -13,7 +13,7 @@ public abstract class IAsyncTaskHandler<R extends Runnable> implements Mailbox<R
@@ -5678,7 +5678,7 @@ index cfe43e882..e7a58989d 100644
  
      protected IAsyncTaskHandler(String s) {
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index 4157e50e4..c522a7c2a 100644
+index 4157e50e4d..c522a7c2a7 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
 @@ -59,8 +59,8 @@ public interface IEntityAccess {
@@ -5767,7 +5767,7 @@ index 4157e50e4..c522a7c2a 100644
          Iterator iterator = this.getPlayers().iterator();
  
 diff --git a/src/main/java/net/minecraft/server/LightEngineBlock.java b/src/main/java/net/minecraft/server/LightEngineBlock.java
-index 93a972605..43424c88a 100644
+index 93a972605c..43424c88ab 100644
 --- a/src/main/java/net/minecraft/server/LightEngineBlock.java
 +++ b/src/main/java/net/minecraft/server/LightEngineBlock.java
 @@ -37,7 +37,7 @@ public final class LightEngineBlock extends LightEngineLayer<LightEngineStorageB
@@ -5780,7 +5780,7 @@ index 93a972605..43424c88a 100644
  
                  if (mutableint.getValue() >= 15) {
 diff --git a/src/main/java/net/minecraft/server/LightEngineLayer.java b/src/main/java/net/minecraft/server/LightEngineLayer.java
-index f72ff8495..f27a14873 100644
+index f72ff8495b..f27a148731 100644
 --- a/src/main/java/net/minecraft/server/LightEngineLayer.java
 +++ b/src/main/java/net/minecraft/server/LightEngineLayer.java
 @@ -11,7 +11,7 @@ public abstract class LightEngineLayer<M extends LightEngineStorageArray<M>, S e
@@ -5793,7 +5793,7 @@ index f72ff8495..f27a14873 100644
      private final IBlockAccess[] h = new IBlockAccess[2];
  
 diff --git a/src/main/java/net/minecraft/server/LightEngineSky.java b/src/main/java/net/minecraft/server/LightEngineSky.java
-index 2301a982e..488d4f289 100644
+index 2301a982e1..488d4f289f 100644
 --- a/src/main/java/net/minecraft/server/LightEngineSky.java
 +++ b/src/main/java/net/minecraft/server/LightEngineSky.java
 @@ -27,7 +27,7 @@ public final class LightEngineSky extends LightEngineLayer<LightEngineStorageSky
@@ -5806,7 +5806,7 @@ index 2301a982e..488d4f289 100644
  
                  if (mutableint.getValue() >= 15) {
 diff --git a/src/main/java/net/minecraft/server/LightEngineStorage.java b/src/main/java/net/minecraft/server/LightEngineStorage.java
-index a3f919816..dacc96414 100644
+index a3f919816e..dacc96414f 100644
 --- a/src/main/java/net/minecraft/server/LightEngineStorage.java
 +++ b/src/main/java/net/minecraft/server/LightEngineStorage.java
 @@ -19,11 +19,12 @@ public abstract class LightEngineStorage<M extends LightEngineStorageArray<M>> e
@@ -5869,7 +5869,7 @@ index a3f919816..dacc96414 100644
              while (objectiterator.hasNext()) {
                  entry = (Entry) objectiterator.next();
 diff --git a/src/main/java/net/minecraft/server/LightEngineStorageArray.java b/src/main/java/net/minecraft/server/LightEngineStorageArray.java
-index b978723a6..5e2051ee1 100644
+index b978723a66..5e2051ee1a 100644
 --- a/src/main/java/net/minecraft/server/LightEngineStorageArray.java
 +++ b/src/main/java/net/minecraft/server/LightEngineStorageArray.java
 @@ -8,10 +8,17 @@ public abstract class LightEngineStorageArray<M extends LightEngineStorageArray<
@@ -5935,7 +5935,7 @@ index b978723a6..5e2051ee1 100644
  
      public void c() {
 diff --git a/src/main/java/net/minecraft/server/LightEngineStorageBlock.java b/src/main/java/net/minecraft/server/LightEngineStorageBlock.java
-index 0f7f4744d..21a15c3b3 100644
+index 0f7f4744d9..21a15c3b3a 100644
 --- a/src/main/java/net/minecraft/server/LightEngineStorageBlock.java
 +++ b/src/main/java/net/minecraft/server/LightEngineStorageBlock.java
 @@ -5,7 +5,7 @@ import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
@@ -5965,7 +5965,7 @@ index 0f7f4744d..21a15c3b3 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/LightEngineStorageSky.java b/src/main/java/net/minecraft/server/LightEngineStorageSky.java
-index 75d9065b3..4669f31b0 100644
+index 75d9065b32..4669f31b04 100644
 --- a/src/main/java/net/minecraft/server/LightEngineStorageSky.java
 +++ b/src/main/java/net/minecraft/server/LightEngineStorageSky.java
 @@ -17,7 +17,7 @@ public class LightEngineStorageSky extends LightEngineStorage<LightEngineStorage
@@ -6092,7 +6092,7 @@ index 75d9065b3..4669f31b0 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index bcd5cc9f2..dd07c67bc 100644
+index bcd5cc9f28..dd07c67bce 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -502,9 +502,9 @@ public final class MCUtil {
@@ -6146,7 +6146,7 @@ index bcd5cc9f2..dd07c67bc 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b31a9ac78..af5dd9f2d 100644
+index b31a9ac78c..af5dd9f2d3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -166,7 +166,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -6170,7 +6170,7 @@ index b31a9ac78..af5dd9f2d 100644
  
          MinecraftTimings.timeUpdateTimer.startTiming(); // Spigot // Paper
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index 98deaba12..fcc3b7c36 100644
+index 98deaba12c..fcc3b7c36b 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
 @@ -67,7 +67,7 @@ public class NBTTagCompound implements NBTBase {
@@ -6183,7 +6183,7 @@ index 98deaba12..fcc3b7c36 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index f06764973..4393ea6dc 100644
+index f06764973f..4393ea6dc3 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -11,7 +11,7 @@ public abstract class NavigationAbstract {
@@ -6228,7 +6228,7 @@ index f06764973..4393ea6dc 100644
  
      public boolean setDestination(@Nullable PathEntity pathentity, double speed) { return a(pathentity, speed); } // Paper - OBFHELPER
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 96a785af2..211a6d720 100644
+index 96a785af27..211a6d7206 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -42,7 +42,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -6241,7 +6241,7 @@ index 96a785af2..211a6d720 100644
      public SocketAddress socketAddress; public void setSpoofedRemoteAddress(SocketAddress address) { this.socketAddress = address; } // Paper - OBFHELPER
      // Spigot Start
 diff --git a/src/main/java/net/minecraft/server/NextTickListEntry.java b/src/main/java/net/minecraft/server/NextTickListEntry.java
-index 33cfeabde..11a4bb882 100644
+index 33cfeabdee..11a4bb882e 100644
 --- a/src/main/java/net/minecraft/server/NextTickListEntry.java
 +++ b/src/main/java/net/minecraft/server/NextTickListEntry.java
 @@ -5,11 +5,13 @@ import java.util.Comparator;
@@ -6312,7 +6312,7 @@ index 33cfeabde..11a4bb882 100644
      public String toString() {
          return this.e + ": " + this.a + ", " + this.b + ", " + this.c + ", " + this.f;
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index ef7ade797..185ed1db3 100644
+index ef7ade797b..185ed1db3b 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -29,7 +29,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -6354,7 +6354,7 @@ index ef7ade797..185ed1db3 100644
                  NBTTagCompound nbttagcompound = tileentity.b();
                  if (tileentity instanceof TileEntitySkull) { TileEntitySkull.sanitizeTileEntityUUID(nbttagcompound); } // Paper
 diff --git a/src/main/java/net/minecraft/server/PairedQueue.java b/src/main/java/net/minecraft/server/PairedQueue.java
-index 85bb22e4b..1e618446a 100644
+index 85bb22e4b7..1e618446a4 100644
 --- a/src/main/java/net/minecraft/server/PairedQueue.java
 +++ b/src/main/java/net/minecraft/server/PairedQueue.java
 @@ -20,32 +20,30 @@ public interface PairedQueue<T, F> {
@@ -6424,7 +6424,7 @@ index 85bb22e4b..1e618446a 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
-index bdb90a346..738c51070 100644
+index bdb90a3466..738c510706 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
 @@ -1,10 +1,11 @@
@@ -6466,7 +6466,7 @@ index bdb90a346..738c51070 100644
  
      public static enum Type {
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
-index 935136771..782edcb63 100644
+index 935136771e..782edcb63b 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalSelector.java
 @@ -1,8 +1,10 @@
@@ -6644,7 +6644,7 @@ index 935136771..782edcb63 100644
  
      public void a(PathfinderGoal.Type pathfindergoal_type, boolean flag) {
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
-index 29657fed7..71919adc0 100644
+index 29657fed75..71919adc0d 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalWrapped.java
 @@ -60,8 +60,10 @@ public class PathfinderGoalWrapped extends PathfinderGoal {
@@ -6661,7 +6661,7 @@ index 29657fed7..71919adc0 100644
  
      public boolean isRunning() { return this.g(); } // Paper - OBFHELPER
 diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java
-index 4240ca81c..69fd3cc8e 100644
+index 4240ca81cb..69fd3cc8ec 100644
 --- a/src/main/java/net/minecraft/server/PathfinderNormal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java
 @@ -443,8 +443,10 @@ public class PathfinderNormal extends PathfinderAbstract {
@@ -6677,7 +6677,7 @@ index 4240ca81c..69fd3cc8e 100644
          if (iblockdata == null) return PathType.BLOCKED; // Paper
          Block block = iblockdata.getBlock();
 diff --git a/src/main/java/net/minecraft/server/PathfinderTargetCondition.java b/src/main/java/net/minecraft/server/PathfinderTargetCondition.java
-index e35ec2db0..e7dfe22ac 100644
+index e35ec2db07..e7dfe22acd 100644
 --- a/src/main/java/net/minecraft/server/PathfinderTargetCondition.java
 +++ b/src/main/java/net/minecraft/server/PathfinderTargetCondition.java
 @@ -51,6 +51,7 @@ public class PathfinderTargetCondition {
@@ -6689,7 +6689,7 @@ index e35ec2db0..e7dfe22ac 100644
          if (entityliving == entityliving1) {
              return false;
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index b38bc6775..729795238 100644
+index b38bc67758..7297952386 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -43,6 +43,18 @@ public class PlayerChunk {
@@ -6871,7 +6871,7 @@ index b38bc6775..729795238 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 57bea926a..aa625ce2a 100644
+index 57bea926a6..aa625ce2a4 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -55,8 +55,9 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -8057,7 +8057,7 @@ index 57bea926a..aa625ce2a 100644
              Iterator iterator = list.iterator();
  
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index ce4340a47..1b60310bb 100644
+index ce4340a476..1b60310bb0 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -20,14 +20,29 @@ public class PlayerInteractManager {
@@ -8182,7 +8182,7 @@ index ce4340a47..1b60310bb 100644
              this.player.playerConnection.sendPacket(new PacketPlayOutBlockChange(this.world, blockposition)); // CraftBukkit - SPIGOT-5196
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerInventory.java b/src/main/java/net/minecraft/server/PlayerInventory.java
-index d103cfaac..1b8cb3fc6 100644
+index d103cfaace..1b8cb3fc61 100644
 --- a/src/main/java/net/minecraft/server/PlayerInventory.java
 +++ b/src/main/java/net/minecraft/server/PlayerInventory.java
 @@ -559,8 +559,10 @@ public class PlayerInventory implements IInventory, INamableTileEntity {
@@ -8199,7 +8199,7 @@ index d103cfaac..1b8cb3fc6 100644
                  list = nonnulllist;
                  break;
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 7b79ee4fe..253ee52eb 100644
+index 7b79ee4fe5..253ee52eb5 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -156,7 +156,7 @@ public abstract class PlayerList {
@@ -8230,7 +8230,7 @@ index 7b79ee4fe..253ee52eb 100644
  
          while (iterator.hasNext()) {
 diff --git a/src/main/java/net/minecraft/server/ProtoChunk.java b/src/main/java/net/minecraft/server/ProtoChunk.java
-index f376e2106..5a883aac1 100644
+index f376e21068..5a883aac14 100644
 --- a/src/main/java/net/minecraft/server/ProtoChunk.java
 +++ b/src/main/java/net/minecraft/server/ProtoChunk.java
 @@ -180,14 +180,11 @@ public class ProtoChunk implements IChunkAccess {
@@ -8266,7 +8266,7 @@ index f376e2106..5a883aac1 100644
                  }
  
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index df728e2c0..5bd7b8f55 100644
+index df728e2c0a..5bd7b8f553 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -28,14 +28,342 @@ public class RegionFile implements AutoCloseable {
@@ -8778,7 +8778,7 @@ index df728e2c0..5bd7b8f55 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 1ebdf73cc..cfa3ecb03 100644
+index 1ebdf73cc9..cfa3ecb031 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;
@@ -8826,7 +8826,7 @@ index 1ebdf73cc..cfa3ecb03 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 0f201000f..c88ad8de0 100644
+index 0f201000f6..c88ad8de0a 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -18,6 +18,30 @@ public class RegionFileCache implements AutoCloseable { // Paper - no final
@@ -8904,7 +8904,7 @@ index 0f201000f..c88ad8de0 100644
              }
  
 diff --git a/src/main/java/net/minecraft/server/RegionFileCompression.java b/src/main/java/net/minecraft/server/RegionFileCompression.java
-index 3382d678e..29137f495 100644
+index 3382d678e6..29137f4959 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;
@@ -8936,7 +8936,7 @@ index 3382d678e..29137f495 100644
          return (InputStream) this.f.wrap(inputstream);
      }
 diff --git a/src/main/java/net/minecraft/server/StructureBoundingBox.java b/src/main/java/net/minecraft/server/StructureBoundingBox.java
-index dbb565e74..118762778 100644
+index dbb565e74d..118762778c 100644
 --- a/src/main/java/net/minecraft/server/StructureBoundingBox.java
 +++ b/src/main/java/net/minecraft/server/StructureBoundingBox.java
 @@ -4,12 +4,12 @@ import com.google.common.base.MoreObjects;
@@ -8975,7 +8975,7 @@ index dbb565e74..118762778 100644
          return baseblockposition.getX() >= this.a && baseblockposition.getX() <= this.d && baseblockposition.getZ() >= this.c && baseblockposition.getZ() <= this.f && baseblockposition.getY() >= this.b && baseblockposition.getY() <= this.e;
      }
 diff --git a/src/main/java/net/minecraft/server/ThreadedMailbox.java b/src/main/java/net/minecraft/server/ThreadedMailbox.java
-index 808256902..8b1a3f3f9 100644
+index 8082569022..8b1a3f3f98 100644
 --- a/src/main/java/net/minecraft/server/ThreadedMailbox.java
 +++ b/src/main/java/net/minecraft/server/ThreadedMailbox.java
 @@ -17,7 +17,7 @@ public class ThreadedMailbox<T> implements Mailbox<T>, AutoCloseable, Runnable {
@@ -8988,7 +8988,7 @@ index 808256902..8b1a3f3f9 100644
  
      public ThreadedMailbox(PairedQueue<? super T, ? extends Runnable> pairedqueue, Executor executor, String s) {
 diff --git a/src/main/java/net/minecraft/server/TickListServer.java b/src/main/java/net/minecraft/server/TickListServer.java
-index f533860bb..a54d36d90 100644
+index f533860bbe..a54d36d90b 100644
 --- a/src/main/java/net/minecraft/server/TickListServer.java
 +++ b/src/main/java/net/minecraft/server/TickListServer.java
 @@ -42,6 +42,11 @@ public class TickListServer<T> implements TickList<T> {
@@ -9111,7 +9111,7 @@ index f533860bb..a54d36d90 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/Ticket.java b/src/main/java/net/minecraft/server/Ticket.java
-index 7a8397815..0d5b1a0b7 100644
+index 7a8397815a..0d5b1a0b7b 100644
 --- a/src/main/java/net/minecraft/server/Ticket.java
 +++ b/src/main/java/net/minecraft/server/Ticket.java
 @@ -5,9 +5,10 @@ import java.util.Objects;
@@ -9136,7 +9136,7 @@ index 7a8397815..0d5b1a0b7 100644
          long j = this.a.b();
  
 diff --git a/src/main/java/net/minecraft/server/TicketType.java b/src/main/java/net/minecraft/server/TicketType.java
-index 4b87ca2ec..141664b55 100644
+index 4b87ca2ecb..141664b554 100644
 --- a/src/main/java/net/minecraft/server/TicketType.java
 +++ b/src/main/java/net/minecraft/server/TicketType.java
 @@ -23,6 +23,7 @@ public class TicketType<T> {
@@ -9148,7 +9148,7 @@ index 4b87ca2ec..141664b55 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/VoxelShapeArray.java b/src/main/java/net/minecraft/server/VoxelShapeArray.java
-index caf297fe9..3161e3b97 100644
+index caf297fe97..3161e3b977 100644
 --- a/src/main/java/net/minecraft/server/VoxelShapeArray.java
 +++ b/src/main/java/net/minecraft/server/VoxelShapeArray.java
 @@ -11,7 +11,7 @@ public final class VoxelShapeArray extends VoxelShape {
@@ -9161,7 +9161,7 @@ index caf297fe9..3161e3b97 100644
  
      VoxelShapeArray(VoxelShapeDiscrete voxelshapediscrete, DoubleList doublelist, DoubleList doublelist1, DoubleList doublelist2) {
 diff --git a/src/main/java/net/minecraft/server/VoxelShapeCubePoint.java b/src/main/java/net/minecraft/server/VoxelShapeCubePoint.java
-index 9e09671dc..b69a1ed46 100644
+index 9e09671dc2..b69a1ed46a 100644
 --- a/src/main/java/net/minecraft/server/VoxelShapeCubePoint.java
 +++ b/src/main/java/net/minecraft/server/VoxelShapeCubePoint.java
 @@ -2,7 +2,7 @@ package net.minecraft.server;
@@ -9174,7 +9174,7 @@ index 9e09671dc..b69a1ed46 100644
      private final int a;
  
 diff --git a/src/main/java/net/minecraft/server/VoxelShapeMergerList.java b/src/main/java/net/minecraft/server/VoxelShapeMergerList.java
-index 71d2ae2a9..9129eaa64 100644
+index 71d2ae2a9c..9129eaa642 100644
 --- a/src/main/java/net/minecraft/server/VoxelShapeMergerList.java
 +++ b/src/main/java/net/minecraft/server/VoxelShapeMergerList.java
 @@ -18,7 +18,7 @@ public final class VoxelShapeMergerList implements VoxelShapeMerger {
@@ -9187,7 +9187,7 @@ index 71d2ae2a9..9129eaa64 100644
          this.c = new IntArrayList(i1);
  
 diff --git a/src/main/java/net/minecraft/server/VoxelShapes.java b/src/main/java/net/minecraft/server/VoxelShapes.java
-index 08c83c62d..d5da9f582 100644
+index 08c83c62df..d5da9f5825 100644
 --- a/src/main/java/net/minecraft/server/VoxelShapes.java
 +++ b/src/main/java/net/minecraft/server/VoxelShapes.java
 @@ -19,7 +19,7 @@ public final class VoxelShapes {
@@ -9200,10 +9200,10 @@ index 08c83c62d..d5da9f582 100644
      public static VoxelShape a() {
          return VoxelShapes.c;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index baad98517..c0c83d433 100644
+index 5117dafbcf..5f69a018d9 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -80,6 +80,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -82,6 +82,8 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
      public final com.destroystokyo.paper.PaperWorldConfig paperConfig; // Paper
      public final ChunkPacketBlockController chunkPacketBlockController; // Paper - Anti-Xray
  
@@ -9212,7 +9212,7 @@ index baad98517..c0c83d433 100644
      public final co.aikar.timings.WorldTimingsHandler timings; // Paper
      public static BlockPosition lastPhysicsProblem; // Spigot
      private org.spigotmc.TickLimiter entityLimiter;
-@@ -129,6 +131,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -131,6 +133,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          this.spigotConfig = new org.spigotmc.SpigotWorldConfig( worlddata.getName() ); // Spigot
          this.paperConfig = new com.destroystokyo.paper.PaperWorldConfig(worlddata.getName(), this.spigotConfig); // Paper
          this.chunkPacketBlockController = this.paperConfig.antiXray ? new ChunkPacketBlockControllerAntiXray(this.paperConfig) : ChunkPacketBlockController.NO_OPERATION_INSTANCE; // Paper - Anti-Xray
@@ -9220,7 +9220,7 @@ index baad98517..c0c83d433 100644
          this.generator = gen;
          this.world = new CraftWorld((WorldServer) this, gen, env);
          this.ticksPerAnimalSpawns = this.getServer().getTicksPerAnimalSpawns(); // CraftBukkit
-@@ -329,6 +332,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -333,6 +336,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
  
      @Override
      public boolean setTypeAndData(BlockPosition blockposition, IBlockData iblockdata, int i) {
@@ -9228,7 +9228,7 @@ index baad98517..c0c83d433 100644
          // CraftBukkit start - tree generation
          if (this.captureTreeGeneration) {
              CraftBlockState blockstate = capturedBlockStates.get(blockposition);
-@@ -425,6 +429,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -429,6 +433,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
  
      // CraftBukkit start - Split off from above in order to directly send client and physic updates
      public void notifyAndUpdatePhysics(BlockPosition blockposition, Chunk chunk, IBlockData oldBlock, IBlockData newBlock, IBlockData actualBlock, int i) {
@@ -9236,7 +9236,7 @@ index baad98517..c0c83d433 100644
          IBlockData iblockdata = newBlock;
          IBlockData iblockdata1 = oldBlock;
          IBlockData iblockdata2 = actualBlock;
-@@ -433,8 +438,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -437,8 +442,13 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
                  this.b(blockposition, iblockdata1, iblockdata2);
              }
  
@@ -9251,7 +9251,7 @@ index baad98517..c0c83d433 100644
              }
  
              if (!this.isClientSide && (i & 1) != 0) {
-@@ -1175,9 +1185,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1179,9 +1189,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          int k = MathHelper.floor((axisalignedbb.minZ - 2.0D) / 16.0D);
          int l = MathHelper.floor((axisalignedbb.maxZ + 2.0D) / 16.0D);
  
@@ -9264,7 +9264,7 @@ index baad98517..c0c83d433 100644
  
                  if (chunk != null) {
                      chunk.a(entity, axisalignedbb, list, predicate);
-@@ -1196,9 +1208,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1200,9 +1212,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          int l = MathHelper.f((axisalignedbb.maxZ + 2.0D) / 16.0D);
          List<T> list = Lists.newArrayList();
  
@@ -9277,7 +9277,7 @@ index baad98517..c0c83d433 100644
  
                  if (chunk != null) {
                      chunk.a(entitytypes, axisalignedbb, list, predicate);
-@@ -1218,10 +1232,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -1222,10 +1236,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          int l = MathHelper.f((axisalignedbb.maxZ + 2.0D) / 16.0D);
          List<T> list = Lists.newArrayList();
          IChunkProvider ichunkprovider = this.getChunkProvider();
@@ -9291,7 +9291,7 @@ index baad98517..c0c83d433 100644
                  if (chunk != null) {
                      chunk.a(oclass, axisalignedbb, list, predicate);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index c74b85917..214b555e7 100644
+index c74b85917a..214b555e73 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 {
@@ -9864,7 +9864,7 @@ index c74b85917..214b555e7 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/WorldUpgrader.java b/src/main/java/net/minecraft/server/WorldUpgrader.java
-index 3030c347e..76f0f258e 100644
+index 3030c347ef..76f0f258e1 100644
 --- a/src/main/java/net/minecraft/server/WorldUpgrader.java
 +++ b/src/main/java/net/minecraft/server/WorldUpgrader.java
 @@ -220,7 +220,7 @@ public class WorldUpgrader {
@@ -9877,10 +9877,10 @@ index 3030c347e..76f0f258e 100644
  
                          try {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fc074a66c..23c3a69fa 100644
+index f70468adab..3a0e027e67 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-@@ -796,6 +796,7 @@ public final class CraftServer implements Server {
+@@ -806,6 +806,7 @@ public final class CraftServer implements Server {
  
          org.spigotmc.SpigotConfig.init((File) console.options.valueOf("spigot-settings")); // Spigot
          com.destroystokyo.paper.PaperConfig.init((File) console.options.valueOf("paper-settings")); // Paper
@@ -9888,7 +9888,7 @@ index fc074a66c..23c3a69fa 100644
          for (WorldServer world : console.getWorlds()) {
              world.worldData.setDifficulty(config.difficulty);
              world.setSpawnFlags(config.spawnMonsters, config.spawnAnimals);
-@@ -812,6 +813,7 @@ public final class CraftServer implements Server {
+@@ -834,6 +835,7 @@ public final class CraftServer implements Server {
              }
              world.spigotConfig.init(); // Spigot
              world.paperConfig.init(); // Paper
@@ -9896,7 +9896,7 @@ index fc074a66c..23c3a69fa 100644
          }
  
          Plugin[] pluginClone = pluginManager.getPlugins().clone(); // Paper
-@@ -1683,7 +1685,10 @@ public final class CraftServer implements Server {
+@@ -1705,7 +1707,10 @@ public final class CraftServer implements Server {
  
      @Override
      public boolean isPrimaryThread() {
@@ -9909,7 +9909,7 @@ index fc074a66c..23c3a69fa 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a14b8cb98..7aed24c8f 100644
+index 1a5ee34103..339ec053c7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -3,6 +3,7 @@ package org.bukkit.craftbukkit;
@@ -10036,7 +10036,7 @@ index a14b8cb98..7aed24c8f 100644
                              list.add(bukkitEntity);
                          }
                          break;
-@@ -2434,10 +2436,43 @@ public class CraftWorld implements World {
+@@ -2454,10 +2456,43 @@ public class CraftWorld implements World {
      // Spigot start
      @Override
      public int getViewDistance() {
@@ -10082,7 +10082,7 @@ index a14b8cb98..7aed24c8f 100644
      private final Spigot spigot = new Spigot()
      {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index cb60310e6..2666940e8 100644
+index cb60310e63..2666940e86 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -137,6 +137,13 @@ public class Main {
@@ -10100,7 +10100,7 @@ index cb60310e6..2666940e8 100644
                  // Paper start
                  acceptsAll(asList("server-name"), "Name of the server")
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index dfa15372b..949acb1d3 100644
+index dfa15372b8..949acb1d32 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -180,6 +180,18 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -10123,7 +10123,7 @@ index dfa15372b..949acb1d3 100644
      public Chunk getChunk() {
          net.minecraft.server.Chunk currentChunk = entity.getCurrentChunk();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 60f62f19c..516a01648 100644
+index 60f62f19cb..516a016480 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,6 @@
@@ -10190,7 +10190,7 @@ index 60f62f19c..516a01648 100644
  
      // Spigot start
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 6e165a164..e160f03c1 100644
+index 6e165a1649..e160f03c1e 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -4,6 +4,7 @@ import java.util.Collection;
@@ -10277,7 +10277,7 @@ index 6e165a164..e160f03c1 100644
  
      /**
 diff --git a/src/main/java/org/spigotmc/AsyncCatcher.java b/src/main/java/org/spigotmc/AsyncCatcher.java
-index 9f7d2ef93..c3ac1a46c 100644
+index 9f7d2ef932..c3ac1a46c3 100644
 --- a/src/main/java/org/spigotmc/AsyncCatcher.java
 +++ b/src/main/java/org/spigotmc/AsyncCatcher.java
 @@ -10,7 +10,7 @@ public class AsyncCatcher