Updated Upstream (Bukkit/CraftBukkit/Spigot)

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

Bukkit Changes:
333b9f02 SPIGOT-5422: Add support for 3-dimensional biomes
170d7386 Fix bad link in deprecated FlowerPot MaterialData class

CraftBukkit Changes:
16dc5758 SPIGOT-5449: Fix issue with projectiles
fd25653f SPIGOT-5448: Shulker Boxes collapse empty slots when picked up
b97d581a SPIGOT-5443: BEE_NEST BlockState
73698cf8 SPIGOT-5442: Fix issue with fire charges
beff9fb9 SPIGOT-5437: Fix CustomChunkGenerator.CustomBiomeGrid ignoring the y value for biomes
f777640e SPIGOT-5425: Prevent empty/air loot (again?)
db0dafb1 SPIGOT-5422: Add support for 3-dimensional biomes
4633e6c5 Fix crash with disabled worlds

Spigot Changes:
f39a89ef SPIGOT-5423: Remove covariant type change to give better chance of Java downgrades working

Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch

@@ -1,4 +1,4 @@
-From 8aea92454d5f89b1ab06b6e04ac10945b0f7f81f Mon Sep 17 00:00:00 2001
+From eba2e9ed47d6f889208ad50438c8f06b4571d8eb Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 10 Jun 2017 16:59:40 -0500
 Subject: [PATCH] Fix upstream javadoc warnings and errors
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix upstream javadoc warnings and errors
 Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index 767cdf0a..3858b057 100644
+index e003cf13..00431f94 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -1786,6 +1786,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1844,6 +1844,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -17,7 +17,7 @@ index 767cdf0a..3858b057 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, @Nullable T data);
  
-@@ -1802,6 +1803,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1860,6 +1861,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -25,7 +25,7 @@ index 767cdf0a..3858b057 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, @Nullable T data);
  
-@@ -1852,6 +1854,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1910,6 +1912,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -33,7 +33,7 @@ index 767cdf0a..3858b057 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
  
-@@ -1872,6 +1875,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1930,6 +1933,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -41,7 +41,7 @@ index 767cdf0a..3858b057 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
  
-@@ -1928,6 +1932,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -1986,6 +1990,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -49,7 +49,7 @@ index 767cdf0a..3858b057 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
  
-@@ -1950,6 +1955,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2008,6 +2013,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -57,7 +57,7 @@ index 767cdf0a..3858b057 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
  
-@@ -1973,6 +1979,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2031,6 +2037,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param force whether to send the particle to players within an extended
       *              range and encourage their client to render it regardless of
       *              settings
@@ -65,7 +65,7 @@ index 767cdf0a..3858b057 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force);
  
-@@ -1998,6 +2005,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2056,6 +2063,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
       * @param force whether to send the particle to players within an extended
       *              range and encourage their client to render it regardless of
       *              settings
@@ -192,5 +192,5 @@ index 1b2267f4..1a58734d 100644
          return to;
      }
 -- 
-2.24.0
+2.24.1
 

Spigot-API-Patches/0097-Expand-World.spawnParticle-API-and-add-Builder.patch

@@ -1,4 +1,4 @@
-From a5a392102a4e68a205208efd60e3fb9c7b0d096c Mon Sep 17 00:00:00 2001
+From 494692f9ffc1c759712367e839dc17d08f0272df Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 29 Aug 2017 23:58:48 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -515,10 +515,10 @@ index 49467ac7..d2ceb07c 100644
       * Options which can be applied to redstone dust particles - a particle
       * color and size.
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index c0158a36..fee0f521 100644
+index 25717a9b..b975501e 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
-@@ -2210,7 +2210,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
+@@ -2268,7 +2268,57 @@ public interface World extends PluginMessageRecipient, Metadatable {
       *             the type of this depends on {@link Particle#getDataType()}
       * @param <T> Type
       */
@@ -578,5 +578,5 @@ index c0158a36..fee0f521 100644
      /**
       * Spawns the particle (the number of times specified by count)
 -- 
-2.24.0
+2.24.1
 

Spigot-API-Patches/0185-Name-the-specific-custom-world-gen-plugin-class-that.patch

@@ -1,4 +1,4 @@
-From 2db66ce160d3196ba61e28518479a0a679dc0274 Mon Sep 17 00:00:00 2001
+From f0f2d08f8c81182aab2dc14dc62f513de55f3689 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 2 Oct 2019 21:24:28 -0500
 Subject: [PATCH] Name the specific custom world gen plugin class that throws a
@@ -6,10 +6,10 @@ Subject: [PATCH] Name the specific custom world gen plugin class that throws a
 
 
 diff --git a/src/main/java/org/bukkit/generator/ChunkGenerator.java b/src/main/java/org/bukkit/generator/ChunkGenerator.java
-index dd0123338..3fe6a22e0 100644
+index 5b847bb3..6c9d313f 100644
 --- a/src/main/java/org/bukkit/generator/ChunkGenerator.java
 +++ b/src/main/java/org/bukkit/generator/ChunkGenerator.java
-@@ -84,7 +84,10 @@ public abstract class ChunkGenerator {
+@@ -109,7 +109,10 @@ public abstract class ChunkGenerator {
       */
      @NotNull
      public ChunkData generateChunkData(@NotNull World world, @NotNull Random random, int x, int z, @NotNull BiomeGrid biome) {
@@ -22,5 +22,5 @@ index dd0123338..3fe6a22e0 100644
  
      /**
 -- 
-2.23.0
+2.24.1
 

Spigot-Server-Patches/0032-Optimize-explosions.patch

@@ -1,4 +1,4 @@
-From 83daf1f5fe7b50047031dfadbb0839c5dc087fe7 Mon Sep 17 00:00:00 2001
+From eec5541d4e4b72b627794f842de2b26d94865944 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 11:59:48 -0600
 Subject: [PATCH] Optimize explosions
@@ -25,7 +25,7 @@ index 50dec5cb5..f038d3f7d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 4398f7441..069ffb141 100644
+index d2c31ac1f..64cf5a29c 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -177,7 +177,7 @@ public class Explosion {
@@ -37,7 +37,7 @@ index 4398f7441..069ffb141 100644
                          double d13 = (1.0D - d7) * d12;
  
                          // CraftBukkit start
-@@ -383,4 +383,84 @@ public class Explosion {
+@@ -384,4 +384,84 @@ public class Explosion {
  
          private Effect() {}
      }
@@ -135,7 +135,7 @@ index 983b6906e..81d3a5262 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 970ead244..5eff80d35 100644
+index 5793ebd00..b1f0c6597 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -19,6 +19,7 @@ import org.apache.logging.log4j.util.Supplier;
@@ -155,5 +155,5 @@ index 970ead244..5eff80d35 100644
      public CraftWorld getWorld() {
          return this.world;
 -- 
-2.24.0
+2.24.1
 

Spigot-Server-Patches/0140-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch

@@ -1,4 +1,4 @@
-From 72e3bfa7713a5deae4baf261a1fd63a6a5a7ef10 Mon Sep 17 00:00:00 2001
+From 7803162d6eb5310a29f4ac2a5869eec6b0700432 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:31:46 -0500
 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@@ -265,10 +265,10 @@ index 2a51a241e..0419aea92 100644
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ebe30cc21..b7db32833 100644
+index 2abebd465..1e59f3f14 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1749,7 +1749,7 @@ public class CraftWorld implements World {
+@@ -1773,7 +1773,7 @@ public class CraftWorld implements World {
          } else if (TNTPrimed.class.isAssignableFrom(clazz)) {
              entity = new EntityTNTPrimed(world, x, y, z, null);
          } else if (ExperienceOrb.class.isAssignableFrom(clazz)) {
@@ -301,5 +301,5 @@ index 1b512cc45..fbad04567 100644
      public EntityExperienceOrb getHandle() {
          return (EntityExperienceOrb) entity;
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0161-Implement-ensureServerConversions-API.patch

@@ -1,4 +1,4 @@
-From 8529676f2d0453ba34b52228e3f97076a989b4a6 Mon Sep 17 00:00:00 2001
+From 8265eef5c89938c66997f160170ef15c83912669 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 22:43:12 -0400
 Subject: [PATCH] Implement ensureServerConversions API
@@ -7,10 +7,10 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
 to ensure it meets latest minecraft expectations.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index c9b59fd8d..57f50cccf 100644
+index 01ab19434..8b219b5fa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -334,4 +334,10 @@ public final class CraftItemFactory implements ItemFactory {
+@@ -335,4 +335,10 @@ public final class CraftItemFactory implements ItemFactory {
      public Material updateMaterial(ItemMeta meta, Material material) throws IllegalArgumentException {
          return ((CraftMetaItem) meta).updateMaterial(material);
      }
@@ -22,5 +22,5 @@ index c9b59fd8d..57f50cccf 100644
 +    // Paper end
  }
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0162-Implement-getI18NDisplayName.patch

@@ -1,4 +1,4 @@
-From b1453ada4f219bce1fa153db344add1a5082d5ec Mon Sep 17 00:00:00 2001
+From 4b0055c1746ebc722b062767f34c9e75eb6ff3d2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 23:59:38 -0400
 Subject: [PATCH] Implement getI18NDisplayName
@@ -25,10 +25,10 @@ index c0c13798f..601273933 100644
          return this.c(s);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 57f50cccf..72cc4980e 100644
+index 8b219b5fa..23d775645 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-@@ -339,5 +339,18 @@ public final class CraftItemFactory implements ItemFactory {
+@@ -340,5 +340,18 @@ public final class CraftItemFactory implements ItemFactory {
      public ItemStack ensureServerConversions(ItemStack item) {
          return CraftItemStack.asCraftMirror(CraftItemStack.asNMSCopy(item));
      }
@@ -48,5 +48,5 @@ index 57f50cccf..72cc4980e 100644
      // Paper end
  }
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0218-Expand-World.spawnParticle-API-and-add-Builder.patch

@@ -1,4 +1,4 @@
-From 0dba0a057652fe23e7c2826b6636b2c2a87dbac7 Mon Sep 17 00:00:00 2001
+From 33aeabed1a727fd1745d0c9d8eceef2260106725 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 15 Aug 2017 22:29:12 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -43,10 +43,10 @@ index f84e727d9..8a8c2eaf5 100644
  
              if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b7db32833..a66e4c3f1 100644
+index 1e59f3f14..2f1f308ab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2209,11 +2209,17 @@ public class CraftWorld implements World {
+@@ -2233,11 +2233,17 @@ public class CraftWorld implements World {
  
      @Override
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) {

Spigot-Server-Patches/0222-Allow-spawning-Item-entities-with-World.spawnEntity.patch

@@ -1,4 +1,4 @@
-From 2d0626da9401ac4dd34483b139f05c4ef68e7536 Mon Sep 17 00:00:00 2001
+From dc1627fdf76e17665a6053858faa93c077e62622 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Jun 2018 20:39:20 -0400
 Subject: [PATCH] Allow spawning Item entities with World.spawnEntity
@@ -8,10 +8,10 @@ This API has more capabilities than .dropItem with the Consumer function
 Item can be set inside of the Consumer pre spawn function.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a66e4c3f1..6a7c088f9 100644
+index 2f1f308ab..b66fa7b89 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1441,6 +1441,10 @@ public class CraftWorld implements World {
+@@ -1465,6 +1465,10 @@ public class CraftWorld implements World {
          if (Boat.class.isAssignableFrom(clazz)) {
              entity = new EntityBoat(world, x, y, z);
              entity.setPositionRotation(x, y, z, yaw, pitch);
@@ -23,5 +23,5 @@ index a66e4c3f1..6a7c088f9 100644
              entity = new EntityFallingBlock(world, x, y, z, world.getType(new BlockPosition(x, y, z)));
          } else if (Projectile.class.isAssignableFrom(clazz)) {
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0240-Implement-World.getEntity-UUID-API.patch

@@ -1,14 +1,14 @@
-From bc01b8c3f3db147945c1de837ea3b838f68a85ee Mon Sep 17 00:00:00 2001
+From b8d16f5bd4c542d07b85f6b59001a8f98555a543 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 3 Jul 2018 16:08:14 +0200
 Subject: [PATCH] Implement World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a062e10fc..96ff39e13 100644
+index c31737d35..022eefc67 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1243,6 +1243,15 @@ public class CraftWorld implements World {
+@@ -1267,6 +1267,15 @@ public class CraftWorld implements World {
          return list;
      }
  
@@ -25,5 +25,5 @@ index a062e10fc..96ff39e13 100644
      public void save() {
          org.spigotmc.AsyncCatcher.catchOp("world save"); // Spigot
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0262-Don-t-call-getItemMeta-on-hasItemMeta.patch

@@ -1,4 +1,4 @@
-From 5899397fadd311c18af6469e0aaad56e968f03d2 Mon Sep 17 00:00:00 2001
+From b64736300fe65fae0d26e59dbdef3eb49168adb3 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Thu, 26 Jul 2018 14:10:23 +0200
 Subject: [PATCH] Don't call getItemMeta on hasItemMeta
@@ -11,10 +11,10 @@ Returns true if getDamage() == 0 or has damage tag or other tag is set.
 Check the `ItemMetaTest#testTaggedButNotMeta` method to see how this method behaves.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 553f60987..ba8fbef85 100644
+index a41be8fda..d5e8a7ee6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-@@ -552,7 +552,7 @@ public final class CraftItemStack extends ItemStack {
+@@ -553,7 +553,7 @@ public final class CraftItemStack extends ItemStack {
  
      @Override
      public boolean hasItemMeta() {
@@ -77,5 +77,5 @@ index 3a82bede7..d73141839 100644
      public void testConflictingStoredEnchantment() {
          EnchantmentStorageMeta itemMeta = (EnchantmentStorageMeta) Bukkit.getItemFactory().getItemMeta(Material.ENCHANTED_BOOK);
 -- 
-2.24.0
+2.24.1
 

Spigot-Server-Patches/0263-Ignore-Dead-Entities-in-entityList-iteration.patch

@@ -1,4 +1,4 @@
-From 77cd511493dcb88d5cc010802527140fb5ded829 Mon Sep 17 00:00:00 2001
+From a606cefee223c8904e833771331caf6ab9ae59be Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Jul 2018 12:18:27 -0400
 Subject: [PATCH] Ignore Dead Entities in entityList iteration
@@ -92,10 +92,10 @@ index 0cd48c5bc..f4d6c68f4 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 96ff39e13..cc4788c96 100644
+index 022eefc67..4da55e0df 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -979,6 +979,7 @@ public class CraftWorld implements World {
+@@ -1003,6 +1003,7 @@ public class CraftWorld implements World {
          for (Object o : world.entitiesById.values()) {
              if (o instanceof net.minecraft.server.Entity) {
                  net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o;
@@ -103,7 +103,7 @@ index 96ff39e13..cc4788c96 100644
                  Entity bukkitEntity = mcEnt.getBukkitEntity();
  
                  // Assuming that bukkitEntity isn't null
-@@ -998,6 +999,7 @@ public class CraftWorld implements World {
+@@ -1022,6 +1023,7 @@ public class CraftWorld implements World {
          for (Object o : world.entitiesById.values()) {
              if (o instanceof net.minecraft.server.Entity) {
                  net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o;
@@ -111,7 +111,7 @@ index 96ff39e13..cc4788c96 100644
                  Entity bukkitEntity = mcEnt.getBukkitEntity();
  
                  // Assuming that bukkitEntity isn't null
-@@ -1024,6 +1026,7 @@ public class CraftWorld implements World {
+@@ -1048,6 +1050,7 @@ public class CraftWorld implements World {
  
          for (Object entity: world.entitiesById.values()) {
              if (entity instanceof net.minecraft.server.Entity) {
@@ -119,7 +119,7 @@ index 96ff39e13..cc4788c96 100644
                  Entity bukkitEntity = ((net.minecraft.server.Entity) entity).getBukkitEntity();
  
                  if (bukkitEntity == null) {
-@@ -1047,6 +1050,7 @@ public class CraftWorld implements World {
+@@ -1071,6 +1074,7 @@ public class CraftWorld implements World {
  
          for (Object entity: world.entitiesById.values()) {
              if (entity instanceof net.minecraft.server.Entity) {

Spigot-Server-Patches/0276-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch

@@ -1,14 +1,14 @@
-From bbcf2acacb7383d14529049f4107e319b5276e11 Mon Sep 17 00:00:00 2001
+From ec3f5be9364a62c51d62825ff2f1aa62fb2cbc98 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 15 Aug 2018 01:16:34 -0400
 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 3a21d2cdd..9dcba4d15 100644
+index 299523799..91f2066b1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-@@ -125,9 +125,16 @@ public class CraftChunk implements Chunk {
+@@ -127,9 +127,16 @@ public class CraftChunk implements Chunk {
  
      @Override
      public BlockState[] getTileEntities() {
@@ -25,7 +25,7 @@ index 3a21d2cdd..9dcba4d15 100644
          int index = 0;
          net.minecraft.server.Chunk chunk = getHandle();
  
-@@ -139,7 +146,7 @@ public class CraftChunk implements Chunk {
+@@ -141,7 +148,7 @@ public class CraftChunk implements Chunk {
              }
  
              BlockPosition position = (BlockPosition) obj;
@@ -35,5 +35,5 @@ index 3a21d2cdd..9dcba4d15 100644
  
          return entities;
 -- 
-2.24.0
+2.24.1
 

Spigot-Server-Patches/0279-Send-nearby-packets-from-world-player-list-not-serve.patch

@@ -1,4 +1,4 @@
-From 32d73956a6280906c022a88c9dd528d7ab5c56db Mon Sep 17 00:00:00 2001
+From 36e368d76d98587d80594e5dfa5632c7d6a71cef Mon Sep 17 00:00:00 2001
 From: Mystiflow <mystiflow@gmail.com>
 Date: Fri, 6 Jul 2018 13:21:30 +0100
 Subject: [PATCH] Send nearby packets from world player list not server list
@@ -68,10 +68,10 @@ index f4d6c68f4..a0c714129 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index cc4788c96..a2739b887 100644
+index 4da55e0df..7d8ec9450 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2044,7 +2044,7 @@ public class CraftWorld implements World {
+@@ -2068,7 +2068,7 @@ public class CraftWorld implements World {
          double z = loc.getZ();
  
          PacketPlayOutCustomSoundEffect packet = new PacketPlayOutCustomSoundEffect(new MinecraftKey(sound), SoundCategory.valueOf(category.name()), new Vec3D(x, y, z), volume, pitch);

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

@@ -1,4 +1,4 @@
-From ee1545f6f3c072ea6581746932140afd43ddb8d5 Mon Sep 17 00:00:00 2001
+From d60538b85a1cf56b3c823f0aad268c335d243775 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
@@ -207,10 +207,10 @@ index d59eee27a..c28c0431a 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 29c14c707..b1ae19be7 100644
+index f773534d9..ceb638c98 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1882,15 +1882,21 @@ public class CraftWorld implements World {
+@@ -1906,15 +1906,21 @@ public class CraftWorld implements World {
  
      @Override
      public void setKeepSpawnInMemory(boolean keepLoaded) {

Spigot-Server-Patches/0379-Implement-CraftBlockSoundGroup.patch

@@ -1,4 +1,4 @@
-From fe324f134505b5c854c8ad4e6be09292e86586ff Mon Sep 17 00:00:00 2001
+From 5fa8829e572213f79c592d335e8d5b435ae998ff Mon Sep 17 00:00:00 2001
 From: simpleauthority <jacob@algorithmjunkie.com>
 Date: Tue, 28 May 2019 03:48:51 -0700
 Subject: [PATCH] Implement CraftBlockSoundGroup
@@ -49,7 +49,7 @@ index 000000000..99f99330d
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index 8fb0b5af0..276f207a8 100644
+index c1ff62aa5..de4388165 100644
 --- a/src/main/java/net/minecraft/server/IBlockData.java
 +++ b/src/main/java/net/minecraft/server/IBlockData.java
 @@ -275,6 +275,7 @@ public class IBlockData extends BlockDataAbstract<Block, IBlockData> implements
@@ -96,10 +96,10 @@ index b774d2d8d..0184bf3fc 100644
          return this.D;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 887ade5e8..aef8dd169 100644
+index fa840c3d3..a667e58ed 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-@@ -696,4 +696,11 @@ public class CraftBlock implements Block {
+@@ -697,4 +697,11 @@ public class CraftBlock implements Block {
          AxisAlignedBB aabb = shape.getBoundingBox();
          return new BoundingBox(getX() + aabb.minX, getY() + aabb.minY, getZ() + aabb.minZ, getX() + aabb.maxX, getY() + aabb.maxY, getZ() + aabb.maxZ);
      }

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

@@ -1,4 +1,4 @@
-From 783755ca4f609df8e98ca724b6efa576e29bd117 Mon Sep 17 00:00:00 2001
+From 39e9ae754b5cdd63c29990b615635ffd5f763318 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sat, 13 Jul 2019 09:23:10 -0700
 Subject: [PATCH] Asynchronous chunk IO and loading
@@ -3542,7 +3542,7 @@ index 6a54ccb86..fce37d0d6 100644
          return this.m;
      }
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 7eb87c517..b252684c2 100644
+index 5cb19b105..be3726a83 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -218,7 +218,7 @@ public class RegionFile implements AutoCloseable {
@@ -3940,7 +3940,7 @@ index 049d4ef4e..59b2fc629 100644
  
      // CraftBukkit start
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 7d509856b..7abad24f0 100644
+index b824518a2..739968a69 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -555,22 +555,23 @@ public class CraftWorld implements World {
@@ -3975,7 +3975,7 @@ index 7d509856b..7abad24f0 100644
  
              // fall through to load
              // we do this so we do not re-read the chunk data on disk
-@@ -2354,6 +2355,25 @@ public class CraftWorld implements World {
+@@ -2378,6 +2379,25 @@ public class CraftWorld implements World {
          return persistentRaid.raids.values().stream().map(CraftRaid::new).collect(Collectors.toList());
      }
  
@@ -4030,5 +4030,5 @@ index a1d93200e..6ca0ebfde 100644
                  log.log( Level.SEVERE, "------------------------------" );
                  //
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0405-Performance-improvement-for-Chunk.getEntities.patch

@@ -1,4 +1,4 @@
-From 4dfb47aa6a180f1434d9704e164c1e6261786dad Mon Sep 17 00:00:00 2001
+From 7249cb6d35502af578c780638266144a4cfffd84 Mon Sep 17 00:00:00 2001
 From: wea_ondara <wea_ondara@alpenblock.net>
 Date: Thu, 10 Oct 2019 11:29:42 +0200
 Subject: [PATCH] Performance improvement for Chunk.getEntities
@@ -10,10 +10,10 @@ operation. This patch will reduce the load of plugins which for example
 implement custom moblimits and depend on Chunk.getEntities().
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-index 9dcba4d15..c8b49a389 100644
+index 91f2066b1..9cff8b88b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
-@@ -110,14 +110,14 @@ public class CraftChunk implements Chunk {
+@@ -112,14 +112,14 @@ public class CraftChunk implements Chunk {
          Entity[] entities = new Entity[count];
  
          for (int i = 0; i < 16; i++) {

Spigot-Server-Patches/0406-Fix-spawning-of-hanging-entities-that-are-not-ItemFr.patch

@@ -1,4 +1,4 @@
-From 27992b8d3ae285409e31a19738a2cbbfdbdd71df Mon Sep 17 00:00:00 2001
+From a543776f740a0ac50f9c9ec79952b3e429a3e693 Mon Sep 17 00:00:00 2001
 From: MisterErwin <git@askarian.net>
 Date: Wed, 30 Oct 2019 16:57:54 +0100
 Subject: [PATCH] Fix spawning of hanging entities that are not ItemFrames and
@@ -6,10 +6,10 @@ Subject: [PATCH] Fix spawning of hanging entities that are not ItemFrames and
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 7abad24f0..73e987671 100644
+index 739968a69..a97439102 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1800,7 +1800,12 @@ public class CraftWorld implements World {
+@@ -1824,7 +1824,12 @@ public class CraftWorld implements World {
                  height = 9;
              }
  

work/Bukkit

@@ -1 +1 @@
-Subproject commit cff5f1c332ebd788c79e0f7497d52ce6e11af0ba
+Subproject commit 333b9f02897384708573682fa35605d71a78a4db

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit de42aa13f387632b360c5b1b003b212499f3f4f2
+Subproject commit 16dc5758ae85ea956e97af0e8be8d3497d8c0bde

work/Spigot

@@ -1 +1 @@
-Subproject commit 530f6689ba4fea0365550cc95a50d6b76bbd9dbb
+Subproject commit f39a89ef2d9083acae5a1e09d5991409213b0a89