Handle gen flag for placeholder getChunkAtAsync (#2079)

Also fix a loadChunk call in heightmap api

Spigot-Server-Patches/0003-MC-Dev-fixes.patch

@@ -1,11 +1,11 @@
-From e7ae9977cb612b6047302839a803792f2a8a20b5 Mon Sep 17 00:00:00 2001
+From cc06df92293c73ca71ab2542a33a665e21d290b7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 30 Mar 2016 19:36:20 -0400
 Subject: [PATCH] MC Dev fixes
 
 
 diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
-index 26fa6e7b6..9a839d654 100644
+index 26fa6e7b64..9a839d6540 100644
 --- a/src/main/java/net/minecraft/server/BiomeBase.java
 +++ b/src/main/java/net/minecraft/server/BiomeBase.java
 @@ -42,7 +42,7 @@ public abstract class BiomeBase {
@@ -27,7 +27,7 @@ index 26fa6e7b6..9a839d654 100644
  
      public List<WorldGenFeatureConfigured<?>> e() {
 diff --git a/src/main/java/net/minecraft/server/BlockDataAbstract.java b/src/main/java/net/minecraft/server/BlockDataAbstract.java
-index adc998186..c385c7b0b 100644
+index adc9981868..b370316574 100644
 --- a/src/main/java/net/minecraft/server/BlockDataAbstract.java
 +++ b/src/main/java/net/minecraft/server/BlockDataAbstract.java
 @@ -29,7 +29,7 @@ public abstract class BlockDataAbstract<O, S> implements IBlockDataHolder<S> {
@@ -72,7 +72,7 @@ index adc998186..c385c7b0b 100644
              S s0 = this.f.get(iblockstate, v0);
  
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index f0ff70980..dd47e9cbe 100644
+index f0ff70980d..dd47e9cbe4 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -57,12 +57,12 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
@@ -92,7 +92,7 @@ index f0ff70980..dd47e9cbe 100644
              });
          }
 diff --git a/src/main/java/net/minecraft/server/BlockStateEnum.java b/src/main/java/net/minecraft/server/BlockStateEnum.java
-index b4c8722f0..59d86fc66 100644
+index b4c8722f04..59d86fc66e 100644
 --- a/src/main/java/net/minecraft/server/BlockStateEnum.java
 +++ b/src/main/java/net/minecraft/server/BlockStateEnum.java
 @@ -20,10 +20,10 @@ public class BlockStateEnum<T extends Enum<T> & INamable> extends BlockState<T>
@@ -109,7 +109,7 @@ index b4c8722f0..59d86fc66 100644
  
              if (this.b.containsKey(s1)) {
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index c973ab607..30701fd7f 100644
+index c973ab6076..30701fd7f3 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
 @@ -148,6 +148,6 @@ public class ChunkSection {
@@ -121,7 +121,7 @@ index c973ab607..30701fd7f 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
-index 199f67490..c7a744355 100644
+index 199f674905..c7a744355a 100644
 --- a/src/main/java/net/minecraft/server/EntityFox.java
 +++ b/src/main/java/net/minecraft/server/EntityFox.java
 @@ -97,7 +97,7 @@ public class EntityFox extends EntityAnimal {
@@ -134,7 +134,7 @@ index 199f67490..c7a744355 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
-index 1692e6b47..dbd189afe 100644
+index 1692e6b47e..dbd189afe6 100644
 --- a/src/main/java/net/minecraft/server/EntityVindicator.java
 +++ b/src/main/java/net/minecraft/server/EntityVindicator.java
 @@ -25,7 +25,7 @@ public class EntityVindicator extends EntityIllagerAbstract {
@@ -147,7 +147,7 @@ index 1692e6b47..dbd189afe 100644
          this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, true));
          this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, true));
 diff --git a/src/main/java/net/minecraft/server/GameRules.java b/src/main/java/net/minecraft/server/GameRules.java
-index d8d226708..3de9d264d 100644
+index d8d2267084..3de9d264db 100644
 --- a/src/main/java/net/minecraft/server/GameRules.java
 +++ b/src/main/java/net/minecraft/server/GameRules.java
 @@ -17,7 +17,7 @@ import javax.annotation.Nullable;
@@ -169,7 +169,7 @@ index d8d226708..3de9d264d 100644
              this.e = bifunction;
          }
 diff --git a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
-index 053d408d3..4510018d6 100644
+index 053d408d36..4510018d6f 100644
 --- a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
 +++ b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
 @@ -51,7 +51,7 @@ public abstract class IAsyncTaskHandler<R extends Runnable> implements Mailbox<R
@@ -199,7 +199,7 @@ index 053d408d3..4510018d6 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/IBlockAccess.java b/src/main/java/net/minecraft/server/IBlockAccess.java
-index 2ed611980..6e365f402 100644
+index 2ed6119804..6e365f402c 100644
 --- a/src/main/java/net/minecraft/server/IBlockAccess.java
 +++ b/src/main/java/net/minecraft/server/IBlockAccess.java
 @@ -96,7 +96,7 @@ public interface IBlockAccess {
@@ -212,7 +212,7 @@ index 2ed611980..6e365f402 100644
                  do {
                      if (d12 > 1.0D && d13 > 1.0D && d14 > 1.0D) {
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index e8ae4b5e4..0f4aa698a 100644
+index e8ae4b5e44..0f4aa698aa 100644
 --- a/src/main/java/net/minecraft/server/IBlockData.java
 +++ b/src/main/java/net/minecraft/server/IBlockData.java
 @@ -265,12 +265,12 @@ public class IBlockData extends BlockDataAbstract<Block, IBlockData> implements
@@ -254,7 +254,7 @@ index e8ae4b5e4..0f4aa698a 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index bf7e0d17e..ee22bb038 100644
+index bf7e0d17ef..ee22bb0387 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
 @@ -147,17 +147,17 @@ public interface IEntityAccess {
@@ -292,7 +292,7 @@ index bf7e0d17e..ee22bb038 100644
              if (pathfindertargetcondition.a(entityliving, t0)) {
                  list1.add(t0);
 diff --git a/src/main/java/net/minecraft/server/LootSelectorEntry.java b/src/main/java/net/minecraft/server/LootSelectorEntry.java
-index 929053491..1016325bd 100644
+index 9290534917..1016325bd7 100644
 --- a/src/main/java/net/minecraft/server/LootSelectorEntry.java
 +++ b/src/main/java/net/minecraft/server/LootSelectorEntry.java
 @@ -127,7 +127,7 @@ public abstract class LootSelectorEntry extends LootEntryAbstract {
@@ -320,7 +320,7 @@ index 929053491..1016325bd 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/NBTBase.java b/src/main/java/net/minecraft/server/NBTBase.java
-index cb0c08a14..9aabcb630 100644
+index cb0c08a144..9aabcb630f 100644
 --- a/src/main/java/net/minecraft/server/NBTBase.java
 +++ b/src/main/java/net/minecraft/server/NBTBase.java
 @@ -88,7 +88,7 @@ public interface NBTBase {
@@ -333,7 +333,7 @@ index cb0c08a14..9aabcb630 100644
      default String asString() {
          return this.toString();
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 0dda7aaf6..4e20cfba4 100644
+index 0dda7aaf69..4e20cfba41 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -134,7 +134,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -346,7 +346,7 @@ index 0dda7aaf6..4e20cfba4 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/RegistryBlockID.java b/src/main/java/net/minecraft/server/RegistryBlockID.java
-index 7f89562e9..4efcb8b59 100644
+index 7f89562e90..4efcb8b595 100644
 --- a/src/main/java/net/minecraft/server/RegistryBlockID.java
 +++ b/src/main/java/net/minecraft/server/RegistryBlockID.java
 @@ -27,7 +27,7 @@ public class RegistryBlockID<T> implements Registry<T> {
@@ -359,7 +359,7 @@ index 7f89562e9..4efcb8b59 100644
  
          this.c.set(i, t0);
 diff --git a/src/main/java/net/minecraft/server/RegistryID.java b/src/main/java/net/minecraft/server/RegistryID.java
-index 4cb78c6a3..e15d28671 100644
+index 4cb78c6a3f..e15d286710 100644
 --- a/src/main/java/net/minecraft/server/RegistryID.java
 +++ b/src/main/java/net/minecraft/server/RegistryID.java
 @@ -17,9 +17,9 @@ public class RegistryID<K> implements Registry<K> {
@@ -387,7 +387,7 @@ index 4cb78c6a3..e15d28671 100644
          this.f = 0;
  
 diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java
-index 41a5d1dc2..b3799ab56 100644
+index 41a5d1dc29..b3799ab564 100644
 --- a/src/main/java/net/minecraft/server/SystemUtils.java
 +++ b/src/main/java/net/minecraft/server/SystemUtils.java
 @@ -45,8 +45,8 @@ public class SystemUtils {
@@ -431,7 +431,7 @@ index 41a5d1dc2..b3799ab56 100644
                  if (throwable != null) {
                      completablefuture.completeExceptionally(throwable);
 diff --git a/src/main/java/net/minecraft/server/VillagerTrades.java b/src/main/java/net/minecraft/server/VillagerTrades.java
-index b0d44e377..ff3f15eac 100644
+index b0d44e3778..ff3f15eac0 100644
 --- a/src/main/java/net/minecraft/server/VillagerTrades.java
 +++ b/src/main/java/net/minecraft/server/VillagerTrades.java
 @@ -15,12 +15,12 @@ import javax.annotation.Nullable;
@@ -451,7 +451,7 @@ index b0d44e377..ff3f15eac 100644
          hashmap.put(VillagerProfession.CLERIC, a(ImmutableMap.of(1, new VillagerTrades.IMerchantRecipeOption[] { new VillagerTrades.b(Items.ROTTEN_FLESH, 32, 8, 2), new VillagerTrades.h(Items.REDSTONE, 1, 2, 1)}, 2, new VillagerTrades.IMerchantRecipeOption[] { new VillagerTrades.b(Items.GOLD_INGOT, 3, 6, 10), new VillagerTrades.h(Items.LAPIS_LAZULI, 1, 1, 5)}, 3, new VillagerTrades.IMerchantRecipeOption[] { new VillagerTrades.b(Items.RABBIT_FOOT, 2, 6, 20), new VillagerTrades.h(Blocks.GLOWSTONE, 4, 1, 6, 10)}, 4, new VillagerTrades.IMerchantRecipeOption[] { new VillagerTrades.b(Items.SCUTE, 4, 6, 30), new VillagerTrades.b(Items.GLASS_BOTTLE, 9, 6, 30), new VillagerTrades.h(Items.ENDER_PEARL, 5, 1, 15)}, 5, new VillagerTrades.IMerchantRecipeOption[] { new VillagerTrades.b(Items.NETHER_WART, 22, 6, 30), new VillagerTrades.h(Items.EXPERIENCE_BOTTLE, 3, 1, 30)})));
          hashmap.put(VillagerProfession.ARMORER, a(ImmutableMap.of(1, new VillagerTrades.IMerchantRecipeOption[] { new VillagerTrades.b(Items.COAL, 15, 8, 2), new VillagerTrades.h(new ItemStack(Items.IRON_LEGGINGS), 7, 1, 6, 1, 0.2F), new VillagerTrades.h(new ItemStack(Items.IRON_BOOTS), 4, 1, 6, 1, 0.2F), new VillagerTrades.h(new ItemStack(Items.IRON_HELMET), 5, 1, 6, 1, 0.2F), new VillagerTrades.h(new ItemStack(Items.IRON_CHESTPLATE), 9, 1, 6, 1, 0.2F)}, 2, new VillagerTrades.IMerchantRecipeOption[] { new VillagerTrades.b(Items.IRON_INGOT, 4, 6, 10), new VillagerTrades.h(new ItemStack(Items.pP), 36, 1, 6, 5, 0.2F), new VillagerTrades.h(new ItemStack(Items.CHAINMAIL_BOOTS), 1, 1, 6, 5, 0.2F), new VillagerTrades.h(new ItemStack(Items.CHAINMAIL_LEGGINGS), 3, 1, 6, 5, 0.2F)}, 3, new VillagerTrades.IMerchantRecipeOption[] { new VillagerTrades.b(Items.LAVA_BUCKET, 1, 6, 20), new VillagerTrades.b(Items.DIAMOND, 1, 6, 20), new VillagerTrades.h(new ItemStack(Items.CHAINMAIL_HELMET), 1, 1, 6, 10, 0.2F), new VillagerTrades.h(new ItemStack(Items.CHAINMAIL_CHESTPLATE), 4, 1, 6, 10, 0.2F), new VillagerTrades.h(new ItemStack(Items.SHIELD), 5, 1, 6, 10, 0.2F)}, 4, new VillagerTrades.IMerchantRecipeOption[] { new VillagerTrades.e(Items.DIAMOND_LEGGINGS, 14, 2, 15, 0.2F), new VillagerTrades.e(Items.DIAMOND_BOOTS, 8, 2, 15, 0.2F)}, 5, new VillagerTrades.IMerchantRecipeOption[] { new VillagerTrades.e(Items.DIAMOND_HELMET, 8, 2, 30, 0.2F), new VillagerTrades.e(Items.DIAMOND_CHESTPLATE, 16, 2, 30, 0.2F)})));
 diff --git a/src/main/java/net/minecraft/server/WorldPersistentData.java b/src/main/java/net/minecraft/server/WorldPersistentData.java
-index b251a1d7d..3c5b3fe10 100644
+index b251a1d7d9..3c5b3fe101 100644
 --- a/src/main/java/net/minecraft/server/WorldPersistentData.java
 +++ b/src/main/java/net/minecraft/server/WorldPersistentData.java
 @@ -37,7 +37,7 @@ public class WorldPersistentData {

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

@@ -1,11 +1,11 @@
-From f54c84e030a4d3956c07c3a3dfa22535b14becde Mon Sep 17 00:00:00 2001
+From 79e06adaed0644fd436bf25e6ea36698e5327395 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
 
 
 diff --git a/src/main/java/net/minecraft/server/AttributeInstance.java b/src/main/java/net/minecraft/server/AttributeInstance.java
-index 2f2b10364..b1900ba36 100644
+index 2f2b103641..b1900ba364 100644
 --- a/src/main/java/net/minecraft/server/AttributeInstance.java
 +++ b/src/main/java/net/minecraft/server/AttributeInstance.java
 @@ -21,8 +21,10 @@ public interface AttributeInstance {
@@ -20,7 +20,7 @@ index 2f2b10364..b1900ba36 100644
  
      void b(UUID uuid);
 diff --git a/src/main/java/net/minecraft/server/BlockDataAbstract.java b/src/main/java/net/minecraft/server/BlockDataAbstract.java
-index c385c7b0b..984857479 100644
+index b370316574..841c7d1904 100644
 --- a/src/main/java/net/minecraft/server/BlockDataAbstract.java
 +++ b/src/main/java/net/minecraft/server/BlockDataAbstract.java
 @@ -80,6 +80,7 @@ public abstract class BlockDataAbstract<O, S> implements IBlockDataHolder<S> {
@@ -32,7 +32,7 @@ index c385c7b0b..984857479 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 dd47e9cbe..c927d524a 100644
+index dd47e9cbe4..c927d524a8 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
@@ -69,7 +69,7 @@ index dd47e9cbe..c927d524a 100644
              return this.d(MathHelper.floor(d0), MathHelper.floor(d1), MathHelper.floor(d2));
          }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index ca73bfbd8..26414a07a 100644
+index ca73bfbd83..26414a07a2 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;
@@ -90,7 +90,7 @@ index ca73bfbd8..26414a07a 100644
      public TileEntity a(BlockPosition blockposition, Chunk.EnumTileEntityState chunk_enumtileentitystate) {
          // CraftBukkit start
 diff --git a/src/main/java/net/minecraft/server/ChunkCoordIntPair.java b/src/main/java/net/minecraft/server/ChunkCoordIntPair.java
-index 857b2f886..bbf136614 100644
+index 857b2f8868..bbf136614c 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 {
@@ -105,7 +105,7 @@ index 857b2f886..bbf136614 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java
-index 8bda05515..409dc837c 100644
+index 8bda055159..409dc837c6 100644
 --- a/src/main/java/net/minecraft/server/DataBits.java
 +++ b/src/main/java/net/minecraft/server/DataBits.java
 @@ -82,6 +82,7 @@ public class DataBits {
@@ -117,7 +117,7 @@ index 8bda05515..409dc837c 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 75ba69886..45403fbe3 100644
+index 75ba698868..45403fbe30 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;
@@ -134,7 +134,7 @@ index 75ba69886..45403fbe3 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 4411d5640..28a6be7ab 100644
+index 4411d5640a..28a6be7ab0 100644
 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
 +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
 @@ -8,7 +8,7 @@ import java.util.stream.Collectors;
@@ -176,7 +176,7 @@ index 4411d5640..28a6be7ab 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 4f69e2327..8f5f61f60 100644
+index 4f69e23271..8f5f61f602 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;
@@ -189,7 +189,7 @@ index 4f69e2327..8f5f61f60 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 0ca7cd31f..113532a97 100644
+index 0ca7cd31f4..113532a97b 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -143,6 +143,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -201,7 +201,7 @@ index 0ca7cd31f..113532a97 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 bd515c626..d5ffa9f0f 100644
+index bd515c6264..d5ffa9f0f7 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -126,6 +126,7 @@ public abstract class EntityLiving extends Entity {
@@ -213,7 +213,7 @@ index bd515c626..d5ffa9f0f 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 6ab4c78b3..76142d5dc 100644
+index 6ab4c78b35..76142d5dc2 100644
 --- a/src/main/java/net/minecraft/server/EntityMonster.java
 +++ b/src/main/java/net/minecraft/server/EntityMonster.java
 @@ -4,6 +4,7 @@ import java.util.function.Predicate;
@@ -225,7 +225,7 @@ index 6ab4c78b3..76142d5dc 100644
          super(entitytypes, world);
          this.f = 5;
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index 8c918d0d6..56a2d7df5 100644
+index 8c918d0d68..56a2d7df5e 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -5,6 +5,7 @@ import com.mojang.datafixers.types.Type;
@@ -248,7 +248,7 @@ index 8c918d0d6..56a2d7df5 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
-index 4510018d6..c0d511244 100644
+index 4510018d6f..c0d5112444 100644
 --- a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
 +++ b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
 @@ -64,6 +64,15 @@ public abstract class IAsyncTaskHandler<R extends Runnable> implements Mailbox<R
@@ -268,7 +268,7 @@ index 4510018d6..c0d511244 100644
          this.d.add(r0);
          LockSupport.unpark(this.getThread());
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index e975265a2..aa6a58dd8 100644
+index e975265a28..aa6a58dd88 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;
@@ -328,7 +328,7 @@ index e975265a2..aa6a58dd8 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 000000000..c96f3ed17
+index 0000000000..c96f3ed176
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -0,0 +1,316 @@
@@ -649,7 +649,7 @@ index 000000000..c96f3ed17
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index e16a579b5..3f6d2676e 100644
+index e16a579b55..3f6d2676e7 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
 @@ -23,7 +23,7 @@ public class NBTTagCompound implements NBTBase {
@@ -678,7 +678,7 @@ index e16a579b5..3f6d2676e 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 fe6854d0e..2db7229e9 100644
+index fe6854d0e4..2db7229e91 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -43,7 +43,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -719,7 +719,7 @@ index fe6854d0e..2db7229e9 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 db2fe836c..0d67676f7 100644
+index db2fe836c2..0d67676f7d 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 {
@@ -731,7 +731,7 @@ index db2fe836c..0d67676f7 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 90223deae..63c4dbd32 100644
+index 90223deae3..63c4dbd327 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<?>> {
@@ -743,7 +743,7 @@ index 90223deae..63c4dbd32 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 4e20cfba4..363ab5da1 100644
+index 4e20cfba41..363ab5da12 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -14,7 +14,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -764,7 +764,7 @@ index 4e20cfba4..363ab5da1 100644
          int j = 0;
          ChunkSection[] achunksection = chunk.getSections();
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 68926d0de..5757dd6fb 100644
+index 68926d0de6..5757dd6fb3 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 {
@@ -781,7 +781,7 @@ index 68926d0de..5757dd6fb 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 a5dba62ca..a088658ae 100644
+index a5dba62caf..a088658ae0 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 {
@@ -794,7 +794,7 @@ index a5dba62ca..a088658ae 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 b3824898d..bf4172be5 100644
+index b3824898da..bf4172be52 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 {
@@ -806,7 +806,7 @@ index b3824898d..bf4172be5 100644
          MinecraftKey minecraftkey = IRegistry.POTION.getKey(potionregistry);
  
 diff --git a/src/main/java/net/minecraft/server/RegistryBlockID.java b/src/main/java/net/minecraft/server/RegistryBlockID.java
-index 4efcb8b59..60948afa4 100644
+index 4efcb8b595..60948afa4e 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> {
@@ -818,7 +818,7 @@ index 4efcb8b59..60948afa4 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 b3799ab56..5fae5a123 100644
+index b3799ab564..5fae5a1233 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 {
@@ -831,7 +831,7 @@ index b3799ab56..5fae5a123 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 923d8e28e..404d3d8c8 100644
+index 923d8e28e7..404d3d8c82 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -371,8 +371,9 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -847,7 +847,7 @@ index 923d8e28e..404d3d8c8 100644
  
          return this.setTypeAndData(blockposition, fluid.getBlockData(), 3 | (flag ? 64 : 0));
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 42f7bb0f7..5d71addb0 100644
+index 42f7bb0f7d..5d71addb0c 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 {

Spigot-Server-Patches/0020-Optimize-TileEntity-Ticking.patch

@@ -1,11 +1,11 @@
-From ca6926b3098bec053cba3fe0eb76e9ab125c53bf Mon Sep 17 00:00:00 2001
+From e63f67c77aaff7ad6779485839de524816d225b0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 8 Mar 2015 22:55:25 -0600
 Subject: [PATCH] Optimize TileEntity Ticking
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
-index 271406f8b..85b450c05 100644
+index 271406f8bb..85b450c054 100644
 --- a/src/main/java/net/minecraft/server/TileEntityChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityChest.java
 @@ -7,7 +7,7 @@ import org.bukkit.craftbukkit.entity.CraftHumanEntity;
@@ -90,7 +90,7 @@ index 271406f8b..85b450c05 100644
                  int newPower = Math.max(0, Math.min(15, this.viewingCount));
  
 diff --git a/src/main/java/net/minecraft/server/TileEntityEnderChest.java b/src/main/java/net/minecraft/server/TileEntityEnderChest.java
-index 6908f5003..ed5cdf177 100644
+index 6908f50031..ed5cdf177f 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEnderChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEnderChest.java
 @@ -1,6 +1,6 @@

Spigot-Server-Patches/0304-Allow-chests-to-be-placed-with-NBT-data.patch

@@ -1,11 +1,11 @@
-From 3a94f239a03b331998136ad340f44e43edfeeda0 Mon Sep 17 00:00:00 2001
+From 92fba7dfa88a5b65625cbfe0e1eaba59768b1b84 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 8 Sep 2018 18:43:31 -0500
 Subject: [PATCH] Allow chests to be placed with NBT data
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 2d83c9e79..dec589463 100644
+index 2d83c9e79c..dec5894637 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -235,6 +235,7 @@ public final class ItemStack {
@@ -17,7 +17,7 @@ index 2d83c9e79..dec589463 100644
                      for (BlockState blockstate : blocks) {
                          blockstate.update(true, false);
 diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
-index 85b450c05..efc153de5 100644
+index 85b450c054..efc153de5f 100644
 --- a/src/main/java/net/minecraft/server/TileEntityChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityChest.java
 @@ -309,7 +309,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic

Spigot-Server-Patches/0318-Configurable-connection-throttle-kick-message.patch

@@ -1,4 +1,4 @@
-From 6a69a46b9c475579cb79d20cbe7254763926b6e4 Mon Sep 17 00:00:00 2001
+From 7d3842cf4d49c3efd34b95f750db3d66431f7a22 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 2 Oct 2018 09:57:50 +0100
 Subject: [PATCH] Configurable connection throttle kick message

Spigot-Server-Patches/0319-Hook-into-CB-plugin-rewrites.patch

@@ -1,4 +1,4 @@
-From 673d78c402b9a62e34dcd72f6245d681a3f5982d Mon Sep 17 00:00:00 2001
+From 0db0f9488989805d477cb83f06042bd49f182bd4 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 3 Oct 2018 20:09:18 -0400
 Subject: [PATCH] Hook into CB plugin rewrites

Spigot-Server-Patches/0320-Allow-setting-the-vex-s-summoner.patch

@@ -1,4 +1,4 @@
-From a981972acb8a60a110ebef7a6d3af9da5a0f9921 Mon Sep 17 00:00:00 2001
+From da352f96cbfd231081cd04a5da00ea78b31246df Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 21:47:44 -0500
 Subject: [PATCH] Allow setting the vex's summoner

Spigot-Server-Patches/0321-Add-sun-related-API.patch

@@ -1,4 +1,4 @@
-From d322da3f71ba9a9dc8a6e9f22e55c6c934cf3c21 Mon Sep 17 00:00:00 2001
+From 3ba79e77c97bab8dcf2215be1e954cf465625513 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:21 -0500
 Subject: [PATCH] Add sun related API

Spigot-Server-Patches/0322-Check-Drowned-for-Villager-Aggression-Config.patch

@@ -1,4 +1,4 @@
-From cd284840c725df7a8eea02ff8d453c75a7a73459 Mon Sep 17 00:00:00 2001
+From 6859425abc63fb598cf009358c09b6c8083f3713 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 10 Oct 2018 21:22:44 -0500
 Subject: [PATCH] Check Drowned for Villager Aggression Config

Spigot-Server-Patches/0323-Here-s-Johnny.patch

@@ -1,4 +1,4 @@
-From 93ddfc43fa2c2ba59434c922b5a2590a8be43d6d Mon Sep 17 00:00:00 2001
+From 690601f0df4efb5f454a0de8ecbed0fca385e392 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 01:37:22 -0500
 Subject: [PATCH] Here's Johnny!

Spigot-Server-Patches/0324-Turtle-API.patch

@@ -1,4 +1,4 @@
-From ef41b872c4982e80a19240df91b4ca40084cbd3f Mon Sep 17 00:00:00 2001
+From 596613ec52387886b54f9a9243c624ae7c194958 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 29 Sep 2018 16:08:23 -0500
 Subject: [PATCH] Turtle API

Spigot-Server-Patches/0325-Limit-lightning-strike-effect-distance.patch

@@ -1,4 +1,4 @@
-From 73916b650393d87eefd33f7421b54e6646982228 Mon Sep 17 00:00:00 2001
+From 37c8351104af074650356a7dc5672477383ddfaa Mon Sep 17 00:00:00 2001
 From: Trigary <trigary0@gmail.com>
 Date: Fri, 14 Sep 2018 17:42:08 +0200
 Subject: [PATCH] Limit lightning strike effect distance

Spigot-Server-Patches/0326-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch

@@ -1,4 +1,4 @@
-From ebe724185c8d350a7951fa62dd0990cc078f3633 Mon Sep 17 00:00:00 2001
+From 4ee63a89d46c2475c61eeac8edeaf983b0935bf2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 17 Oct 2018 19:17:27 -0400
 Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles

Spigot-Server-Patches/0327-Call-player-spectator-target-events.patch

@@ -1,4 +1,4 @@
-From ce3acb0e1cfe99fbaca4c4a217715097a63004d0 Mon Sep 17 00:00:00 2001
+From 1b0ba06f41e65e1a4140bd44b4af10e0cf5389ac Mon Sep 17 00:00:00 2001
 From: Caleb Bassham <caleb.bassham@gmail.com>
 Date: Fri, 28 Sep 2018 02:32:19 -0500
 Subject: [PATCH] Call player spectator target events

Spigot-Server-Patches/0328-Add-Velocity-IP-Forwarding-Support.patch

@@ -1,4 +1,4 @@
-From 460ea158187439625e0951326413b2d0da7fad00 Mon Sep 17 00:00:00 2001
+From b543eb88b5bd6e6ccab6ecf524072be8522d0ba3 Mon Sep 17 00:00:00 2001
 From: Andrew Steinborn <git@steinborn.me>
 Date: Mon, 8 Oct 2018 14:36:14 -0400
 Subject: [PATCH] Add Velocity IP Forwarding Support

Spigot-Server-Patches/0329-Add-more-Witch-API.patch

@@ -1,4 +1,4 @@
-From 5d25654758b4bbd9dc4c7f95b95b57467706fc3e Mon Sep 17 00:00:00 2001
+From b176c2be62be6a3c2657676c1070a26ddb9a66e4 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 14:10:46 -0500
 Subject: [PATCH] Add more Witch API

Spigot-Server-Patches/0330-Fix-MC-93764.patch

@@ -1,4 +1,4 @@
-From b8da8ba3db1cfbe5c440f12c1617737c865d4c3c Mon Sep 17 00:00:00 2001
+From c0a62dfce82db9577af0453144b86466acb8b8ba Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Oct 2018 19:38:45 -0500
 Subject: [PATCH] Fix MC-93764

Spigot-Server-Patches/0331-Add-option-to-prevent-players-from-moving-into-unloa.patch

@@ -1,4 +1,4 @@
-From b4b24e23121b8abb473476ba641da3ffa07b0931 Mon Sep 17 00:00:00 2001
+From 4a8c9bb5813d00985b6b80c6f234cab04e0d5634 Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Mon, 22 Oct 2018 17:34:10 +0200
 Subject: [PATCH] Add option to prevent players from moving into unloaded

Spigot-Server-Patches/0332-Reset-players-airTicks-on-respawn.patch

@@ -1,4 +1,4 @@
-From 9d717c0c68d7bf0f990590915caa787ef2c97286 Mon Sep 17 00:00:00 2001
+From 378a782578c405a98c97d149b9e424181485f569 Mon Sep 17 00:00:00 2001
 From: GreenMeanie <GreenMeanieMC@gmail.com>
 Date: Sat, 20 Oct 2018 22:34:02 -0400
 Subject: [PATCH] Reset players airTicks on respawn

Spigot-Server-Patches/0333-Strip-private-area-unicode-characters-from-signs.patch

@@ -1,4 +1,4 @@
-From be6c4e46629b49524e0383d07753a5287143826d Mon Sep 17 00:00:00 2001
+From d7aa704a36270d8a211c86be9d94633632b7fd16 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Tue, 23 Oct 2018 20:53:43 -0400
 Subject: [PATCH] Strip private area unicode characters from signs

Spigot-Server-Patches/0334-Don-t-sleep-after-profile-lookups-if-not-needed.patch

@@ -1,4 +1,4 @@
-From 3352661913ce300d8e92ca22b725abdf99e09b9b Mon Sep 17 00:00:00 2001
+From d85618b21ca55efa8898e6734b9d8418f6b6f677 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 23 Oct 2018 20:25:05 -0400
 Subject: [PATCH] Don't sleep after profile lookups if not needed

Spigot-Server-Patches/0335-Use-more-reasonable-thread-count-default-for-bootstr.patch

@@ -1,4 +1,4 @@
-From bea7762967b9a0ca706ab671928ad78c75a0294a Mon Sep 17 00:00:00 2001
+From 62a2276ba4f68423d8219fe1a10d879e7eaae29c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 23 Oct 2018 23:14:38 -0400
 Subject: [PATCH] Use more reasonable thread count default for bootstrap

Spigot-Server-Patches/0336-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch

@@ -1,4 +1,4 @@
-From 69df5dbd97ea63a84acbff30fa43539b36776692 Mon Sep 17 00:00:00 2001
+From 659e995f3d68ba6cdb4e8c90755a585c939550fc Mon Sep 17 00:00:00 2001
 From: MisterVector <whizkid3000@hotmail.com>
 Date: Thu, 1 Nov 2018 14:50:05 -0700
 Subject: [PATCH] MC-136865: Use valid item for enchantment checks on block

Spigot-Server-Patches/0337-Optimize-World-Time-Updates.patch

@@ -1,4 +1,4 @@
-From 409c9eb3f44f34a54c5cd6320293344f33a112bd Mon Sep 17 00:00:00 2001
+From f2a5e08671d415085a214f6db1736372657121d3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Nov 2018 23:11:51 -0400
 Subject: [PATCH] Optimize World Time Updates

Spigot-Server-Patches/0338-Restore-custom-InventoryHolder-support.patch

@@ -1,4 +1,4 @@
-From 5654850bc4648a960664978ad828fa45ead8d7eb Mon Sep 17 00:00:00 2001
+From 2c07fd4a50bfd746966bda875b7ca8b05f37d16c Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 5 Nov 2018 04:23:51 +0000
 Subject: [PATCH] Restore custom InventoryHolder support

Spigot-Server-Patches/0339-Use-Vanilla-Minecart-Speeds.patch

@@ -1,4 +1,4 @@
-From 5eecb10090f5f4762301c4115fe3f9fe8fa3cf16 Mon Sep 17 00:00:00 2001
+From 7d96e66012a0c1672ab15a87d9edbb49c4a2c86b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 8 Nov 2018 21:33:09 -0500
 Subject: [PATCH] Use Vanilla Minecart Speeds

Spigot-Server-Patches/0340-Fix-SpongeAbsortEvent-handling.patch

@@ -1,4 +1,4 @@
-From ecb0f9a525dcd709af7ffe6dc12b0057f5e98a97 Mon Sep 17 00:00:00 2001
+From d5809d56b1675e8aecdb5098b5b4d833bb00ea4d Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 10 Nov 2018 05:15:21 +0000
 Subject: [PATCH] Fix SpongeAbsortEvent handling

Spigot-Server-Patches/0341-Don-t-allow-digging-into-unloaded-chunks.patch

@@ -1,4 +1,4 @@
-From a09a58f07239dd4589f5439d67339d2fd94f4db5 Mon Sep 17 00:00:00 2001
+From 987b27d4beed5b49317ad424505f24c8b3b8ed6c Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Nov 2018 21:01:09 +0000
 Subject: [PATCH] Don't allow digging into unloaded chunks

Spigot-Server-Patches/0342-Optimize-redstone-algorithm.patch

@@ -1,4 +1,4 @@
-From f15f1eb7a46d5306a08aeeaab913329077e9f421 Mon Sep 17 00:00:00 2001
+From b990778d9e771f99514d739f93e7b23793e45de2 Mon Sep 17 00:00:00 2001
 From: theosib <millerti@172.16.221.1>
 Date: Thu, 27 Sep 2018 01:43:35 -0600
 Subject: [PATCH] Optimize redstone algorithm

Spigot-Server-Patches/0343-force-entity-dismount-during-teleportation.patch

@@ -1,4 +1,4 @@
-From 373ddc724284b8fe67c16fbc02eb1b617eba8120 Mon Sep 17 00:00:00 2001
+From a4b6407b3594e7d93d59ace1a8be23d7b60f90ee Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 15 Nov 2018 13:38:37 +0000
 Subject: [PATCH] force entity dismount during teleportation

Spigot-Server-Patches/0344-Book-Size-Limits.patch

@@ -1,4 +1,4 @@
-From f6ba68dff289d0c882210db346177f7b60fde6ec Mon Sep 17 00:00:00 2001
+From 06a9565bdf6252f34736bad3a31b96fd7af8d840 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 16 Nov 2018 23:08:50 -0500
 Subject: [PATCH] Book Size Limits

Spigot-Server-Patches/0345-Make-the-default-permission-message-configurable.patch

@@ -1,4 +1,4 @@
-From 2fb7d628c80d5a2687651ee3ad8333eb8afd3471 Mon Sep 17 00:00:00 2001
+From 1f02d93234d4fcf4192513792a85ee84f56e9bae Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 18 Nov 2018 19:49:56 +0000
 Subject: [PATCH] Make the default permission message configurable

Spigot-Server-Patches/0346-Add-more-Zombie-API.patch

@@ -1,4 +1,4 @@
-From bb8e017aca6dc0f778874c9aff7b34bb7b2c1fac Mon Sep 17 00:00:00 2001
+From e9aac9d0eee1722ec3f54ccf47b003f9f20943da Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 04:29:59 -0500
 Subject: [PATCH] Add more Zombie API

Spigot-Server-Patches/0347-Prevent-rayTrace-from-loading-chunks.patch

@@ -1,4 +1,4 @@
-From d6f2a498ef3bc9d5231fa81deb32ddaf11aeb4e6 Mon Sep 17 00:00:00 2001
+From fe8bbf3a3d68f8d28fba3fe328e3265cd60517e7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 26 Nov 2018 19:21:58 -0500
 Subject: [PATCH] Prevent rayTrace from loading chunks

Spigot-Server-Patches/0348-Handle-Large-Packets-disconnecting-client.patch

@@ -1,4 +1,4 @@
-From c191d3ad2b26adff2384d546f04a5fa0df94ae3d Mon Sep 17 00:00:00 2001
+From 024bead5390ee6da9c568bb7fcea7f7d4c622709 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Nov 2018 21:18:06 -0500
 Subject: [PATCH] Handle Large Packets disconnecting client

Spigot-Server-Patches/0349-Lazy-init-world-storage-in-CraftOfflinePlayer.patch

@@ -1,4 +1,4 @@
-From 4455737927d18c12864863aae7b472a529936694 Mon Sep 17 00:00:00 2001
+From 070edbb804f4e729db9769ea1d4328193ed1e64b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Tue, 11 Dec 2018 22:25:07 -0500
 Subject: [PATCH] Lazy init world storage in CraftOfflinePlayer

Spigot-Server-Patches/0350-Add-PlayerConnectionCloseEvent.patch

@@ -1,4 +1,4 @@
-From f6d3bade4a828792fa385903471b5f7bd40b65e8 Mon Sep 17 00:00:00 2001
+From 407ab0e7727628357667a57aca6b106cec825832 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 7 Oct 2018 12:05:28 -0700
 Subject: [PATCH] Add PlayerConnectionCloseEvent

Spigot-Server-Patches/0351-Prevent-Enderman-from-loading-chunks.patch

@@ -1,4 +1,4 @@
-From 61e7e1fd21138e68eddd4d37f560713c259de939 Mon Sep 17 00:00:00 2001
+From 6f1a89ab8eebfbfbe65ee5614a680eeef4d79c06 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 18 Dec 2018 02:15:08 +0000
 Subject: [PATCH] Prevent Enderman from loading chunks

Spigot-Server-Patches/0352-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch

@@ -1,4 +1,4 @@
-From 8de870014ade7786cf691958d00d748f70ee2d8d Mon Sep 17 00:00:00 2001
+From 2e94d3290943ab6c44c5638944eaaaf052b49ede Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 2 Jan 2019 00:35:43 -0600
 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed

Spigot-Server-Patches/0353-Fix-PlayerEditBookEvent.patch

@@ -1,4 +1,4 @@
-From c167ffa665c75e09aef00926c808137f14ac0f17 Mon Sep 17 00:00:00 2001
+From 49cfbfcb59324b88f46e7b81901afb79b97a0959 Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Sun, 16 Dec 2018 13:07:33 +1100
 Subject: [PATCH] Fix PlayerEditBookEvent

Spigot-Server-Patches/0354-Workaround-for-vehicle-tracking-issue-on-disconnect.patch

@@ -1,4 +1,4 @@
-From 4d9266472d0a9fc84b622eb5ae7eac04857c0f20 Mon Sep 17 00:00:00 2001
+From abce431e6f4d621444140426b81e1d231721c3c2 Mon Sep 17 00:00:00 2001
 From: connorhartley <vectrixu+gh@gmail.com>
 Date: Mon, 7 Jan 2019 14:43:48 -0600
 Subject: [PATCH] Workaround for vehicle tracking issue on disconnect

Spigot-Server-Patches/0355-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch

@@ -1,4 +1,4 @@
-From e0ce75ac3af28feb8d75d6f798a0bbebf1c5d44c Mon Sep 17 00:00:00 2001
+From 337c8ee898a441c2fc15dc36d571dd6e041a69b9 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Thu, 31 Jan 2019 16:33:36 -0500
 Subject: [PATCH] Fire BlockPistonRetractEvent for all empty pistons

Spigot-Server-Patches/0356-Block-Entity-remove-from-being-called-on-Players.patch

@@ -1,4 +1,4 @@
-From 8a8cfa2d3047fa402441f9dd3f622713cd6f19a1 Mon Sep 17 00:00:00 2001
+From 2ac407162a5fd4200642ba66592488e1b83ca039 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 4 Feb 2019 23:33:24 -0500
 Subject: [PATCH] Block Entity#remove from being called on Players

Spigot-Server-Patches/0357-Allow-Saving-of-Oversized-Chunks.patch

@@ -1,4 +1,4 @@
-From f13ed643df25ab2b58cfaa502ed1fca9d8fce9f8 Mon Sep 17 00:00:00 2001
+From 9ba87df328f8b499250bef748c30b090e681b844 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Feb 2019 01:08:19 -0500
 Subject: [PATCH] Allow Saving of Oversized Chunks

Spigot-Server-Patches/0358-BlockDestroyEvent.patch

@@ -1,4 +1,4 @@
-From f84f42559de248f8f97dda307343e95b4202f136 Mon Sep 17 00:00:00 2001
+From 0dd7839f11b0dff4ab0910e6246b8b6d2311f0f3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 6 Feb 2019 00:20:33 -0500
 Subject: [PATCH] BlockDestroyEvent

Spigot-Server-Patches/0359-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch

@@ -1,4 +1,4 @@
-From f031ab685f49dc1158381dcb458970337c347477 Mon Sep 17 00:00:00 2001
+From 2f776d6a9af54c6293b720f12e3b209825566475 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Jan 2019 00:08:15 -0500
 Subject: [PATCH] Fix Custom Shapeless Custom Crafting Recipes

Spigot-Server-Patches/0360-Fix-sign-edit-memory-leak.patch

@@ -1,4 +1,4 @@
-From 47e2bc9010beaa48f6499f936412878261da768c Mon Sep 17 00:00:00 2001
+From 24bd14e05fadfcb184ef9f267a39fa90198f7c84 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 Feb 2019 00:15:28 -0500
 Subject: [PATCH] Fix sign edit memory leak

Spigot-Server-Patches/0361-Limit-Client-Sign-length-more.patch

@@ -1,4 +1,4 @@
-From f01f48bbb3786d447d576151c774f91c4499233e Mon Sep 17 00:00:00 2001
+From 5f4e624628fc1a527b82852dc1e4a9d90ef3ad25 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Feb 2019 22:18:40 -0500
 Subject: [PATCH] Limit Client Sign length more

Spigot-Server-Patches/0362-Don-t-check-ConvertSigns-boolean-every-sign-save.patch

@@ -1,4 +1,4 @@
-From c131ebf976c1884fcf24cea8e413853dca989a51 Mon Sep 17 00:00:00 2001
+From 9776417d8d875edf5917b48bf15fbf6c6e3535e5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 11:11:29 -0500
 Subject: [PATCH] Don't check ConvertSigns boolean every sign save

Spigot-Server-Patches/0363-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch

@@ -1,4 +1,4 @@
-From cb25754c6b1cd1ea55947df7962231e573f4813e Mon Sep 17 00:00:00 2001
+From 6739ab85f30c15163e96ab90ae32845a7dd673d0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 14:55:01 -0500
 Subject: [PATCH] Handle Excessive Signs in Chunks creating too large of

Spigot-Server-Patches/0364-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch

@@ -1,4 +1,4 @@
-From cb5fb077ba3d4403c080d5165ed22b6c61d8cec5 Mon Sep 17 00:00:00 2001
+From 185829b14187a520feaa42a47e03e3699be4be08 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 16:12:35 -0500
 Subject: [PATCH] MC-145260: Fix Whitelist On/Off inconsistency

Spigot-Server-Patches/0365-Set-Zombie-last-tick-at-start-of-drowning-process.patch

@@ -1,4 +1,4 @@
-From 4ed1f174035172513d488e323c518c1a2e595a34 Mon Sep 17 00:00:00 2001
+From 97133b0d00820d4cd879ca27bc287ca99da4e0d6 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 4 Mar 2019 02:23:28 -0500
 Subject: [PATCH] Set Zombie last tick at start of drowning process

Spigot-Server-Patches/0366-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch

@@ -1,4 +1,4 @@
-From a0e2ac24e56ccc005d349e47d69f118805fadd62 Mon Sep 17 00:00:00 2001
+From 434e05fb5d6761f734a270b245065ddcf724c8b8 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 13 Mar 2019 20:08:09 +0200
 Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled

Spigot-Server-Patches/0367-Add-LivingEntity-getTargetEntity.patch

@@ -1,4 +1,4 @@
-From fb511806774c4635515a6748ccd10e1cec571d94 Mon Sep 17 00:00:00 2001
+From 8468765bbe54cab6939d0262f3f5fa1b34e391a6 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Sep 2018 00:33:08 -0500
 Subject: [PATCH] Add LivingEntity#getTargetEntity

Spigot-Server-Patches/0368-Use-proper-max-length-when-serialising-BungeeCord-te.patch

@@ -1,4 +1,4 @@
-From a39a1f7f5491685a94e71862cd7b13d5107bd01a Mon Sep 17 00:00:00 2001
+From d798bfdf9dd228cf95c347109de90ade49267a10 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 20 Mar 2019 21:19:29 -0700
 Subject: [PATCH] Use proper max length when serialising BungeeCord text

Spigot-Server-Patches/0369-Entity-getEntitySpawnReason.patch

@@ -1,4 +1,4 @@
-From 6e6ee4fad7ff75661e710c36dbacad0bfa44a473 Mon Sep 17 00:00:00 2001
+From d0601e9eb3df15290103dfbdd9846e901d6be6eb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 00:24:52 -0400
 Subject: [PATCH] Entity#getEntitySpawnReason

Spigot-Server-Patches/0370-Update-entity-Metadata-for-all-tracked-players.patch

@@ -1,4 +1,4 @@
-From 75adfc0b8852ba9ddb63294e94c07a7746c4765d Mon Sep 17 00:00:00 2001
+From b0e5b40fe58f89fbf8e377d6130bc5ea6dfc915b Mon Sep 17 00:00:00 2001
 From: AgentTroll <woodyc40@gmail.com>
 Date: Fri, 22 Mar 2019 22:24:03 -0700
 Subject: [PATCH] Update entity Metadata for all tracked players

Spigot-Server-Patches/0371-Fire-event-on-GS4-query.patch

@@ -1,4 +1,4 @@
-From 99e60a3248e393efc38dba41811df8e3a6456ffd Mon Sep 17 00:00:00 2001
+From 7bc287e8e5304cf5cf12c17c3cd502a744c10f4b Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 17 Mar 2019 21:46:56 +0200
 Subject: [PATCH] Fire event on GS4 query

Spigot-Server-Patches/0372-Implement-PlayerPostRespawnEvent.patch

@@ -1,4 +1,4 @@
-From fdcd5e2ccf83dd0bf0a1368ac0d5ef27e7ebea5c Mon Sep 17 00:00:00 2001
+From 12d46c5f652a3f47f4740bac4251e21b3532fec4 Mon Sep 17 00:00:00 2001
 From: MisterVector <whizkid3000@hotmail.com>
 Date: Fri, 26 Oct 2018 21:31:00 -0700
 Subject: [PATCH] Implement PlayerPostRespawnEvent

Spigot-Server-Patches/0373-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch

@@ -1,4 +1,4 @@
-From 4ff0f9e5cdb039f9b78009c6a7fadaf0955d3f8f Mon Sep 17 00:00:00 2001
+From 764b24edaabf014f8f78ddfe62373b08b7bcdbca Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 18:09:20 -0400
 Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items

Spigot-Server-Patches/0374-Implement-getters-and-setters-for-EntityItem-owner-a.patch

@@ -1,4 +1,4 @@
-From abebe94d9bdaff5c2cefc20fa6084598a2549f01 Mon Sep 17 00:00:00 2001
+From 17311814efe73699b1d645c45cf741bd3412b472 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 20:54:23 -0500
 Subject: [PATCH] Implement getters and setters for EntityItem owner and

Spigot-Server-Patches/0375-Server-Tick-Events.patch

@@ -1,4 +1,4 @@
-From f7cfb32940e6bb8be5cb2592737ac9096d194878 Mon Sep 17 00:00:00 2001
+From 6e2e717f5fc90a9ef99da3e9b7aa4bf5fa4f97ab Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Mar 2019 22:48:45 -0400
 Subject: [PATCH] Server Tick Events

Spigot-Server-Patches/0376-PlayerDeathEvent-getItemsToKeep.patch

@@ -1,4 +1,4 @@
-From ee6d727581021ba502e260ef7772b815b2724540 Mon Sep 17 00:00:00 2001
+From 6d42540bbba2bf21b39166ea0e636ff4bee8cba9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Mar 2019 23:01:33 -0400
 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep

Spigot-Server-Patches/0377-Optimize-Persistent-Data-Loading.patch

@@ -1,4 +1,4 @@
-From d39b404790e0c44cd8e5e240f83b0f46b099d8f1 Mon Sep 17 00:00:00 2001
+From d8de8d4ebb8cb1dd8f03e238050bc321bc00fe06 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Mar 2019 01:25:11 -0400
 Subject: [PATCH] Optimize Persistent Data Loading

Spigot-Server-Patches/0378-Allow-login-events-to-fire-only-after-the-server-plu.patch

@@ -1,4 +1,4 @@
-From f94dc3af55ef48919f99002a334e18aa5ad2e65e Mon Sep 17 00:00:00 2001
+From 3814eb72628f8e3e7f1e9b0c9154349be28cfc15 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 31 Mar 2019 22:02:24 -0700
 Subject: [PATCH] Allow login events to fire only after the server plugins are

Spigot-Server-Patches/0379-Make-region-files-more-reliable-to-write-to.patch

@@ -1,4 +1,4 @@
-From f7ff00e543826ddede7043a2a93f59b389c4e3ef Mon Sep 17 00:00:00 2001
+From 0d26702629e2456743cf0b9912dfa576da92b7a5 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 1 Apr 2019 18:57:32 -0700
 Subject: [PATCH] Make region files more reliable to write to

Spigot-Server-Patches/0380-Optimize-GameRules-to-use-LinkedHashMap.patch

@@ -1,4 +1,4 @@
-From 127e9fe0670c0334e6807ea3c207a27e2c1663b5 Mon Sep 17 00:00:00 2001
+From 0873499ce9dcbdcd222964cef01acfafdc42838c Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Thu, 4 Apr 2019 17:55:05 -0700
 Subject: [PATCH] Optimize GameRules to use LinkedHashMap

Spigot-Server-Patches/0381-Optimize-Captured-TileEntity-Lookup.patch

@@ -1,4 +1,4 @@
-From dd363bdf7c277f900fb5c05ac99ed1e04b31a734 Mon Sep 17 00:00:00 2001
+From 48c86a17e671c11bf8f8b5ff4fa5dc951f0973fc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 6 Apr 2019 10:16:48 -0400
 Subject: [PATCH] Optimize Captured TileEntity Lookup

Spigot-Server-Patches/0382-Add-Heightmap-API.patch

@@ -1,4 +1,4 @@
-From 4ad300b90a4f9c708ccf1caa43826252d9cede13 Mon Sep 17 00:00:00 2001
+From 941463f14cfc204a80c45bdd321f37df10d537e6 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 1 Jan 2019 02:22:01 -0800
 Subject: [PATCH] Add Heightmap API
@@ -20,7 +20,7 @@ index ad58d4fd63..c04d73e738 100644
  
          if (i >= -30000000 && j >= -30000000 && i < 30000000 && j < 30000000) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3ebea96931..174d2d4ea0 100644
+index 3ebea96931..2c6a42d921 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -317,6 +317,29 @@ public class CraftWorld implements World {
@@ -30,7 +30,7 @@ index 3ebea96931..174d2d4ea0 100644
 +    // Paper start - Implement heightmap api
 +    @Override
 +    public int getHighestBlockYAt(final int x, final int z, final com.destroystokyo.paper.HeightmapType heightmap) throws UnsupportedOperationException {
-+        this.loadChunk(x >> 4, z >> 4); // heightmap will ret 0 on unloaded areas
++        this.getChunkAt(x >> 4, z >> 4); // heightmap will ret 0 on unloaded areas
 +
 +        switch (heightmap) {
 +            case LIGHT_BLOCKING:

Spigot-Server-Patches/0383-Handle-bad-chunks-more-gracefully.patch

@@ -1,4 +1,4 @@
-From 8e2010031aebf8e022a66c2600558212976c47e8 Mon Sep 17 00:00:00 2001
+From 0de8ed448197686a90452895fa6597c66f2b1602 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 15 Apr 2019 02:24:52 +0100
 Subject: [PATCH] Handle bad chunks more gracefully

Spigot-Server-Patches/0384-Mob-Spawner-API-Enhancements.patch

@@ -1,4 +1,4 @@
-From 0d1caacd7a1fd4d782c0bef9340cedf81b820ffe Mon Sep 17 00:00:00 2001
+From 29b2ccba2eb3ffc215097a596168f7198077623b Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 19 Apr 2019 12:41:13 -0500
 Subject: [PATCH] Mob Spawner API Enhancements

Spigot-Server-Patches/0385-Per-Player-View-Distance-API-placeholders.patch

@@ -1,4 +1,4 @@
-From 7ae8490660016d837931ef812ccedbb7a04b58fa Mon Sep 17 00:00:00 2001
+From 2c4b2974a33baa8de9fa6aa00bba111e7a3c311e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 6 May 2019 01:29:25 -0400
 Subject: [PATCH] Per-Player View Distance API placeholders

Spigot-Server-Patches/0386-Async-Chunk-placeholder.patch

@@ -1,4 +1,4 @@
-From 97b715a164d05940fbea66bcf2c578d1c07133eb Mon Sep 17 00:00:00 2001
+From d46faf4272e81e9b34628ddab57a719db5811892 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 6 May 2019 12:29:24 -0700
 Subject: [PATCH] Async Chunk placeholder
@@ -6,7 +6,7 @@ Subject: [PATCH] Async Chunk placeholder
 Until we figure out Mojang's ticket system.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 174d2d4ea0..88d179342f 100644
+index 2c6a42d921..63f953617d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -14,6 +14,7 @@ import java.util.Objects;
@@ -17,18 +17,41 @@ index 174d2d4ea0..88d179342f 100644
  import java.util.function.Predicate;
  import net.minecraft.server.AxisAlignedBB;
  import net.minecraft.server.BiomeBase;
-@@ -2117,6 +2118,17 @@ public class CraftWorld implements World {
+@@ -2117,6 +2118,40 @@ public class CraftWorld implements World {
          return (nearest == null) ? null : new Location(this, nearest.getX(), nearest.getY(), nearest.getZ());
      }
  
 +    // Paper start
++    private Chunk getChunkAtGen(int x, int z, boolean gen) {
++        // copied from loadChunk()
++        // this function is identical except we do not add a plugin ticket
++        IChunkAccess chunk = world.getChunkProvider().getChunkAt(x, z, gen || isChunkGenerated(x, z) ? ChunkStatus.FULL : ChunkStatus.EMPTY, true);
++
++        // If generate = false, but the chunk already exists, we will get this back.
++        if (chunk instanceof ProtoChunkExtension) {
++            // We then cycle through again to get the full chunk immediately, rather than after the ticket addition
++            chunk = world.getChunkProvider().getChunkAt(x, z, ChunkStatus.FULL, true);
++        }
++
++        if (chunk instanceof net.minecraft.server.Chunk) {
++            return ((net.minecraft.server.Chunk)chunk).bukkitChunk;
++        }
++
++        return null;
++    }
 +
 +    @Override
 +    public CompletableFuture<Chunk> getChunkAtAsync(int x, int z, boolean gen) {
 +        // TODO placeholder
-+        CompletableFuture<Chunk> ret = new CompletableFuture<>();
-+        ret.complete(getChunkAt(x, z));
-+        return ret;
++        if (Bukkit.isPrimaryThread()) {
++            return CompletableFuture.completedFuture(getChunkAtGen(x, z, gen));
++        } else {
++            CompletableFuture<Chunk> ret = new CompletableFuture<>();
++            net.minecraft.server.MinecraftServer.getServer().scheduleOnMain(() -> {
++                ret.complete(getChunkAtGen(x, z, gen));
++            });
++            return ret;
++        }
 +    }
 +    // Paper end
 +

Spigot-Server-Patches/0387-Fix-CB-call-to-changed-postToMainThread-method.patch

@@ -1,4 +1,4 @@
-From d3eaa111b7d6dfd67df2c0f8ed30ceb37711f0eb Mon Sep 17 00:00:00 2001
+From 9b6b9b936b8fa80a419e04add6f5a60682b5de25 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 10 May 2019 18:38:19 +0100
 Subject: [PATCH] Fix CB call to changed postToMainThread method

Spigot-Server-Patches/0388-Fix-sounds-when-item-frames-are-modified-MC-123450.patch

@@ -1,4 +1,4 @@
-From 569bbb31c998583effa5b028623671af71e58895 Mon Sep 17 00:00:00 2001
+From ae31e09d00f6e60de0e0d3441bbb4ace5b513106 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sat, 27 Apr 2019 20:00:43 +0100
 Subject: [PATCH] Fix sounds when item frames are modified (MC-123450)

Spigot-Server-Patches/0389-Fix-MC-151674-Close-RegionFiles-when-they-get-evicte.patch

@@ -1,4 +1,4 @@
-From 4e77b273a6312dfb0f96db8d75f310c0c5e47bb3 Mon Sep 17 00:00:00 2001
+From 2d33ee44fd678400b3161717072346f6ce42897f Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 12 May 2019 19:25:53 -0700
 Subject: [PATCH] Fix MC-151674 Close RegionFiles when they get evicted from

Spigot-Server-Patches/0390-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch

@@ -1,4 +1,4 @@
-From 2b5d6bba187e8491490f1428588e846de0038291 Mon Sep 17 00:00:00 2001
+From b148fb3d588048a666ca096c1a04e86156490632 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 13 May 2019 21:10:59 -0700
 Subject: [PATCH] Fix CraftServer#isPrimaryThread and MinecraftServer

Spigot-Server-Patches/0391-Elide-lock-in-DataWatcher.patch

@@ -1,4 +1,4 @@
-From 048d145c7ccb0a3f4ab58fa2ebb820cab6587335 Mon Sep 17 00:00:00 2001
+From 98cc3cb91faf6f13c939c3b88c47fbdb8bf68932 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 11 May 2019 08:19:27 -0700
 Subject: [PATCH] Elide lock in DataWatcher

Spigot-Server-Patches/0392-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch

@@ -1,4 +1,4 @@
-From 9f7d50d96af345270799a30c2a0d941ac3ffd5b8 Mon Sep 17 00:00:00 2001
+From b28152e7109bd52570ed1afe148cdb03ad5c87ff Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Sep 2018 21:49:53 -0400
 Subject: [PATCH] Fix issues with entity loss due to unloaded chunks

Spigot-Server-Patches/0393-Duplicate-UUID-Resolve-Option.patch

@@ -1,4 +1,4 @@
-From c48bcdced365c757fadea5adb6d9cf42bbacf3c3 Mon Sep 17 00:00:00 2001
+From 81d58874be226a14cbcb3a3049e39fb8a21382d6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 14:27:34 -0400
 Subject: [PATCH] Duplicate UUID Resolve Option

Spigot-Server-Patches/0394-improve-CraftWorld-isChunkLoaded.patch

@@ -1,4 +1,4 @@
-From 11c700f7bb5cbf60cfdacc3826a4684c523f030b Mon Sep 17 00:00:00 2001
+From 941a96e870ebf99e170d97cb135929ff7d7bfd3c Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 21 May 2019 02:34:04 +0100
 Subject: [PATCH] improve CraftWorld#isChunkLoaded
@@ -9,7 +9,7 @@ waiting for the execution queue to get to our request; We can just query
 the chunk status and get a response now, vs having to wait
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 88d179342f..c2e4eaf099 100644
+index 63f953617d..c0207694ac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -382,8 +382,7 @@ public class CraftWorld implements World {

Spigot-Server-Patches/0395-Configurable-Keep-Spawn-Loaded-range-per-world.patch

@@ -1,4 +1,4 @@
-From b87435f92f1bf7621ca2ab3147438a17fc75a9bb Mon Sep 17 00:00:00 2001
+From 2775414ea28a4c9b395727da48bb6693ad201640 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -148,7 +148,7 @@ index 3ed12672e3..dd2133665f 100644
  
      public LongSet getForceLoadedChunks() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index c2e4eaf099..5cf3c4108f 100644
+index c0207694ac..feb673ae9d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1748,15 +1748,21 @@ public class CraftWorld implements World {

Spigot-Server-Patches/0396-Fix-some-generation-concurrency-issues.patch

@@ -1,4 +1,4 @@
-From aba3a4f667265a230ca5db9b3b92e07fe48c4325 Mon Sep 17 00:00:00 2001
+From 038e772811ddc76b261d395d3a474f9e2f987863 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 24 May 2019 07:53:16 +0100
 Subject: [PATCH] Fix some generation concurrency issues