Updated Upstream (Bukkit/CraftBukkit/Spigot) (#2576)

* 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:
6527cb58 SPIGOT-5329: Clarify isGlowing documentation
5ddb414f Make Lantern extend BlockData
cb888903 Fix typos in previous commits
2a5e0ca2 Bring EnchantItemEvent documentation in line with EnchantmentOffer
3c5fcea2 SPIGOT-5317: Create accessors for player absorption hearts
c6e0d625 SPIGOT-5320: Clarify scope of ExactChoice

CraftBukkit Changes:
a3fdef8c SPIGOT-5331: Add support for Java 13
6ddeb980 SPIGOT-5317: Create accessors for player absorption hearts
5d335e96 SPIGOT-5315: Cannot serialize armor stand ItemMeta

Spigot Changes:
94af569b SPIGOT-5319: Async catcher for getNearbyEntities

Spigot-API-Patches/0007-Entity-Origin-API.patch

@@ -1,14 +1,14 @@
-From 1e4cedf5e513f03fc6aa7cb07056f169ed04053c Mon Sep 17 00:00:00 2001
+From 5da75bccc7609d731a581c3220f046e6bc9f08f8 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 17:50:31 -0600
 Subject: [PATCH] Entity Origin API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 699c31d97..c8439d644 100644
+index d6f9836a1..9cb41f101 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -606,4 +606,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -612,4 +612,16 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
      @Override
      Spigot spigot();
      // Spigot end
@@ -66,5 +66,5 @@ index 5a8789324..3022b4a27 100644
 +    }
  }
 -- 
-2.21.0
+2.22.1
 

Spigot-API-Patches/0059-Entity-fromMobSpawner.patch

@@ -1,14 +1,14 @@
-From 2253f78d43d8e82d209391872fa827b5279fb412 Mon Sep 17 00:00:00 2001
+From bb5fbadd8a83da05bf97bee17be747e7a1211d8b Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index c8439d644..35d0909b1 100644
+index 9cb41f101..ade1bf5f1 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -617,5 +617,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -623,5 +623,12 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      @Nullable
      Location getOrigin();
@@ -22,5 +22,5 @@ index c8439d644..35d0909b1 100644
      // Paper end
  }
 -- 
-2.21.0
+2.22.1
 

Spigot-API-Patches/0118-Entity-getChunk-API.patch

@@ -1,4 +1,4 @@
-From 2c1b68e524a382c801ef3273c3732e0ae31b3e0c Mon Sep 17 00:00:00 2001
+From aad3f10a51d870c9362a602a3dad7e9472880a8d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 02:25:48 -0400
 Subject: [PATCH] Entity#getChunk API
@@ -6,7 +6,7 @@ Subject: [PATCH] Entity#getChunk API
 Get the chunk the entity is currently registered to
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 35d0909b1..adca48f18 100644
+index ade1bf5f1..5a7776fa4 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
 @@ -3,6 +3,7 @@ package org.bukkit.entity;
@@ -17,7 +17,7 @@ index 35d0909b1..adca48f18 100644
  import org.bukkit.EntityEffect;
  import org.bukkit.Location;
  import org.bukkit.Nameable;
-@@ -624,5 +625,13 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -630,5 +631,13 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       * @return True if entity spawned from a mob spawner
       */
      boolean fromMobSpawner();
@@ -32,5 +32,5 @@ index 35d0909b1..adca48f18 100644
      // Paper end
  }
 -- 
-2.21.0
+2.22.1
 

Spigot-API-Patches/0174-Entity-getEntitySpawnReason.patch

@@ -1,4 +1,4 @@
-From bf78a33f7ec7a3641872c26d76d73a2b3781ed4f Mon Sep 17 00:00:00 2001
+From c6ad801f5bc4b5336f6f1e09679d9e31f5c5c4dc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 00:21:23 -0400
 Subject: [PATCH] Entity#getEntitySpawnReason
@@ -10,10 +10,10 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
 diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index f41243f92..29229c646 100644
+index e063733fa..98b26cd93 100644
 --- a/src/main/java/org/bukkit/entity/Entity.java
 +++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -657,5 +657,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
+@@ -663,5 +663,11 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
       */
      @NotNull
      Chunk getChunk();
@@ -26,5 +26,5 @@ index f41243f92..29229c646 100644
      // Paper end
  }
 -- 
-2.21.0
+2.22.1
 

Spigot-Server-Patches/0025-Entity-Origin-API.patch

@@ -1,4 +1,4 @@
-From 9e3518478df4aa3a756cb7abb94b4449f9ce5115 Mon Sep 17 00:00:00 2001
+From 21b03cb08a8d6105d0131943b1031391041231a1 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
@@ -117,10 +117,10 @@ index 8a7e66647..8ec482c94 100644
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index a98f6f338..d1d37c06b 100644
+index 824becd27..7d9d0a1f7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1009,4 +1009,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1010,4 +1010,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          return spigot;
      }
      // Spigot end
@@ -134,5 +134,5 @@ index a98f6f338..d1d37c06b 100644
 +    // Paper end
  }
 -- 
-2.23.0
+2.22.1
 

Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch

@@ -1,14 +1,14 @@
-From 79217cb0b53cf7dc77e9e07086ee7a54f7364ef0 Mon Sep 17 00:00:00 2001
+From 050e035a301c95145bb4c1c8f0c4a74a67d15f6d Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:18:39 -0600
 Subject: [PATCH] Be a bit more informative in maxHealth exception
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 2e007d4ffc..4948e61da9 100644
+index 9c1d4e758..029c2d475 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -104,7 +104,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -105,7 +105,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setHealth(double health) {
          health = (float) health;
          if ((health < 0) || (health > getMaxHealth())) {
@@ -21,5 +21,5 @@ index 2e007d4ffc..4948e61da9 100644
  
          getHandle().setHealth((float) health);
 -- 
-2.22.0
+2.22.1
 

Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch

@@ -1,14 +1,14 @@
-From e17fd478da771d89e0b77adb036d3152650f0827 Mon Sep 17 00:00:00 2001
+From 8114e0e26ee38a3683d2167e0cba2ff3423bb941 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:43:39 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 82b3c0a7de..aa50435bec 100644
+index 029c2d475..7e9aff668 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -598,4 +598,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -611,4 +611,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public <T> void setMemory(MemoryKey<T> memoryKey, T t) {
          getHandle().getBehaviorController().setMemory(CraftMemoryKey.fromMemoryKey(memoryKey), CraftMemoryMapper.toNms(t));
      }
@@ -26,5 +26,5 @@ index 82b3c0a7de..aa50435bec 100644
 +    // Paper end
  }
 -- 
-2.22.0
+2.22.1
 

Spigot-Server-Patches/0064-Handle-Item-Meta-Inconsistencies.patch

@@ -1,4 +1,4 @@
-From 17820a70c51cf44459ba0a4268c18d3f75f405cb Mon Sep 17 00:00:00 2001
+From d00d86703dd6469a144ab9ef3d7337a87ff2713a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 May 2015 23:00:19 -0400
 Subject: [PATCH] Handle Item Meta Inconsistencies
@@ -193,7 +193,7 @@ index b0f9fa0ec..9c9852f7a 100644
  
      static Map<Enchantment, Integer> getEnchantments(net.minecraft.server.ItemStack item) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index cdfefbfaf..fe318914f 100644
+index 9dabe313c..79ab6e167 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -6,6 +6,7 @@ import com.google.common.collect.ImmutableList;
@@ -220,7 +220,7 @@ index cdfefbfaf..fe318914f 100644
  import java.util.logging.Level;
  import java.util.logging.Logger;
  import javax.annotation.Nonnull;
-@@ -270,7 +273,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -271,7 +274,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
      private List<IChatBaseComponent> lore;
      private Integer customModelData;
      private NBTTagCompound blockData;
@@ -229,7 +229,7 @@ index cdfefbfaf..fe318914f 100644
      private Multimap<Attribute, AttributeModifier> attributeModifiers;
      private int repairCost;
      private int hideFlag;
-@@ -281,7 +284,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -282,7 +285,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
      private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
  
      private NBTTagCompound internalTag;
@@ -238,7 +238,7 @@ index cdfefbfaf..fe318914f 100644
      private final CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(DATA_TYPE_REGISTRY);
  
      private int version = CraftMagicNumbers.INSTANCE.getDataVersion(); // Internal use only
-@@ -302,7 +305,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -303,7 +306,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          this.blockData = meta.blockData;
  
          if (meta.enchantments != null) { // Spigot
@@ -247,7 +247,7 @@ index cdfefbfaf..fe318914f 100644
          }
  
          if (meta.hasAttributeModifiers()) {
-@@ -398,13 +401,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -399,13 +402,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          }
      }
  
@@ -263,7 +263,7 @@ index cdfefbfaf..fe318914f 100644
  
          for (int i = 0; i < ench.size(); i++) {
              String id = ((NBTTagCompound) ench.get(i)).getString(ENCHANTMENTS_ID.NBT);
-@@ -556,13 +559,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -557,13 +560,13 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          }
      }
  
@@ -279,7 +279,7 @@ index cdfefbfaf..fe318914f 100644
          for (Map.Entry<?, ?> entry : ench.entrySet()) {
              // Doctor older enchants
              String enchantKey = entry.getKey().toString();
-@@ -813,14 +816,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -814,14 +817,14 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
  
      @Override
      public Map<Enchantment, Integer> getEnchants() {
@@ -296,7 +296,7 @@ index cdfefbfaf..fe318914f 100644
          }
  
          if (ignoreRestrictions || level >= ench.getStartLevel() && level <= ench.getMaxLevel()) {
-@@ -1201,7 +1204,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1202,7 +1205,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
              clone.customModelData = this.customModelData;
              clone.blockData = this.blockData;
              if (this.enchantments != null) {
@@ -305,7 +305,7 @@ index cdfefbfaf..fe318914f 100644
              }
              if (this.hasAttributeModifiers()) {
                  clone.attributeModifiers = LinkedHashMultimap.create(this.attributeModifiers);
-@@ -1430,6 +1433,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1431,6 +1434,23 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
          }
      }
  
@@ -330,5 +330,5 @@ index cdfefbfaf..fe318914f 100644
      private final Spigot spigot = new Spigot()
      {
 -- 
-2.23.0
+2.22.1
 

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

@@ -1,4 +1,4 @@
-From c3b79911080cb54b76b5fa9fe4008855c258b7aa Mon Sep 17 00:00:00 2001
+From 49715ed5eb6e4374ec3c60a9e86f439b3253ccbc 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 0cb2e6d87..2bbd3663a 100644
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 75a3a8a88..8798ecae3 100644
+index 6addb271c..4180ec7ae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1713,7 +1713,7 @@ public class CraftWorld implements World {
+@@ -1714,7 +1714,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.23.0
+2.22.1
 

Spigot-Server-Patches/0163-Entity-fromMobSpawner.patch

@@ -1,11 +1,11 @@
-From f2644404c77b9c3a56656a7c49c5db077787d5b4 Mon Sep 17 00:00:00 2001
+From 84600057c686d41de05de42fa07a3c3285851bb2 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 482864ac62..be4ebcadb7 100644
+index 482864ac6..be4ebcadb 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -184,6 +184,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -37,7 +37,7 @@ index 482864ac62..be4ebcadb7 100644
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 13e62e3d7f..4bd511dd7c 100644
+index 13e62e3d7..4bd511dd7 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -133,6 +133,7 @@ public abstract class MobSpawnerAbstract {
@@ -49,10 +49,10 @@ index 13e62e3d7f..4bd511dd7c 100644
                          if ( entity.world.spigotConfig.nerfSpawnerMobs )
                          {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index ed496d03ae..b000bc8c71 100644
+index 91c5bb511..09ca9a3eb 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1047,5 +1047,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1048,5 +1048,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
          Location origin = getHandle().origin;
          return origin == null ? null : origin.clone();
      }
@@ -64,5 +64,5 @@ index ed496d03ae..b000bc8c71 100644
      // Paper end
  }
 -- 
-2.22.0
+2.22.1
 

Spigot-Server-Patches/0173-LivingEntity-setKiller.patch

@@ -1,11 +1,11 @@
-From 24f63e31e78e209ed3fea9cbe1b1536b13c5459d Mon Sep 17 00:00:00 2001
+From 3cc596d6759ac8ec57121500b9ddc72e0878c46d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:49:48 -0500
 Subject: [PATCH] LivingEntity#setKiller
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 0733caf7bd..efc7617957 100644
+index a016cbb21..46dfb3c49 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -76,7 +76,7 @@ public abstract class EntityLiving extends Entity {
@@ -18,10 +18,10 @@ index 0733caf7bd..efc7617957 100644
      protected int ticksFarFromPlayer;
      protected float aT;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index aa50435bec..42cc158824 100644
+index 7e9aff668..b8482c632 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -304,6 +304,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -317,6 +317,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return getHandle().killer == null ? null : (Player) getHandle().killer.getBukkitEntity();
      }
  
@@ -39,5 +39,5 @@ index aa50435bec..42cc158824 100644
      public boolean addPotionEffect(PotionEffect effect) {
          return addPotionEffect(effect, false);
 -- 
-2.22.0
+2.22.1
 

Spigot-Server-Patches/0199-Add-ArmorStand-Item-Meta.patch

@@ -1,4 +1,4 @@
-From bb932fe2cbe96eb3c7f8ae245f07ed48d81656ab Mon Sep 17 00:00:00 2001
+From 30fb8da83a3ed927d1654c99de8a26013719a7c6 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 27 Jan 2018 17:04:14 -0500
 Subject: [PATCH] Add ArmorStand Item Meta
@@ -267,18 +267,10 @@ index f70052284..3723facca 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index fe318914f..7a7e96926 100644
+index 79ab6e167..ac6ff834c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-@@ -163,6 +163,7 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
-                     .put(CraftMetaTropicalFishBucket.class, "TROPICAL_FISH_BUCKET")
-                     .put(CraftMetaCrossbow.class, "CROSSBOW")
-                     .put(CraftMetaSuspiciousStew.class, "SUSPICIOUS_STEW")
-+                    .put(CraftMetaArmorStand.class, "ARMOR_STAND") // Paper
-                     .put(CraftMetaItem.class, "UNSPECIFIC")
-                     .build();
- 
-@@ -1426,7 +1427,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
+@@ -1427,7 +1427,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
                          CraftMetaTropicalFishBucket.VARIANT.NBT,
                          CraftMetaCrossbow.CHARGED.NBT,
                          CraftMetaCrossbow.CHARGED_PROJECTILES.NBT,
@@ -316,5 +308,5 @@ index b07a3051c..919f2ffa9 100644
                      return cleanStack;
                  }
 -- 
-2.23.0
+2.22.1
 

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

@@ -1,4 +1,4 @@
-From 13bd7215a2ea91d0707bf7c417287ac9679de28c Mon Sep 17 00:00:00 2001
+From d48b6279df2a21e61a47ef09ee4b66fd73b071f5 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 594401c39..cbabe7743 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 8798ecae3..16de4efef 100644
+index 4180ec7ae..3c7b54802 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2179,11 +2179,17 @@ public class CraftWorld implements World {
+@@ -2180,11 +2180,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) {
@@ -66,5 +66,5 @@ index 8798ecae3..16de4efef 100644
                  x, y, z, // Position
                  count,  // Count
 -- 
-2.23.0
+2.22.1
 

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

@@ -1,4 +1,4 @@
-From f498a1a83a6ead6408383a780c51342aa5b78e71 Mon Sep 17 00:00:00 2001
+From 8e7d16b57c518d616a82aba17dd8102319886ede 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 16de4efef..00ce2fecf 100644
+index 3c7b54802..ebc47aec7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1407,6 +1407,10 @@ public class CraftWorld implements World {
+@@ -1408,6 +1408,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 16de4efef..00ce2fecf 100644
              entity = new EntityFallingBlock(world, x, y, z, world.getType(new BlockPosition(x, y, z)));
          } else if (Projectile.class.isAssignableFrom(clazz)) {
 -- 
-2.23.0
+2.22.1
 

Spigot-Server-Patches/0231-Fix-CraftEntity-hashCode.patch

@@ -1,4 +1,4 @@
-From 7aac589b834910f337649ac862cc5c4bded521e3 Mon Sep 17 00:00:00 2001
+From c08536aeb0cb0387c9b623a5b4df96df67131771 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 20:20:15 -0400
 Subject: [PATCH] Fix CraftEntity hashCode
@@ -21,10 +21,10 @@ check is essentially the same as this.getHandle() == other.getHandle()
 However, replaced it too to make it clearer of intent.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index b000bc8c71..1cd3448e57 100644
+index 09ca9a3eb..517e42218 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -720,14 +720,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -721,14 +721,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
              return false;
          }
          final CraftEntity other = (CraftEntity) obj;
@@ -45,5 +45,5 @@ index b000bc8c71..1cd3448e57 100644
  
      @Override
 -- 
-2.22.0
+2.22.1
 

Spigot-Server-Patches/0234-Make-shield-blocking-delay-configurable.patch

@@ -1,11 +1,11 @@
-From 370986b06ddf12b6508978905b94d0e75f742699 Mon Sep 17 00:00:00 2001
+From 4cf5578f687a0d20448b35a1e2935c1dc6dabefd Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 16 Jun 2018 01:18:16 -0500
 Subject: [PATCH] Make shield blocking delay configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index da10550030..182ac2e7f6 100644
+index da1055003..182ac2e7f 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -360,4 +360,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index da10550030..182ac2e7f6 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 74c1f7c447..a873685e47 100644
+index 74c1f7c44..a873685e4 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2922,7 +2922,7 @@ public abstract class EntityLiving extends Entity {
@@ -48,10 +48,10 @@ index 74c1f7c447..a873685e47 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 4cbe1ec22c..06cc48a1dc 100644
+index b8482c632..67f275321 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -619,5 +619,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -632,5 +632,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setArrowsStuck(int arrows) {
          getHandle().setArrowCount(arrows);
      }
@@ -68,5 +68,5 @@ index 4cbe1ec22c..06cc48a1dc 100644
      // Paper end
  }
 -- 
-2.22.0
+2.22.1
 

Spigot-Server-Patches/0241-LivingEntity-Hand-Raised-Item-Use-API.patch

@@ -1,4 +1,4 @@
-From ea688d4a7f14a44362f33e207c455d5bdf1a9181 Mon Sep 17 00:00:00 2001
+From 404dfaf1316cf2354fa664407478f5cd0085a1e6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:21:28 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index dfbd40a997..e1972f7935 100644
+index dfbd40a99..e1972f793 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -109,7 +109,7 @@ public abstract class EntityLiving extends Entity {
@@ -32,10 +32,10 @@ index dfbd40a997..e1972f7935 100644
          return this.isHandRaised() ? this.activeItem.k() - this.dm() : 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 06cc48a1dc..0610d0d5c0 100644
+index 67f275321..379239567 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -629,5 +629,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -642,5 +642,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public void setShieldBlockingDelay(int delay) {
          getHandle().setShieldBlockingDelay(delay);
      }
@@ -62,5 +62,5 @@ index 06cc48a1dc..0610d0d5c0 100644
      // Paper end
  }
 -- 
-2.22.0
+2.22.1
 

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

@@ -1,14 +1,14 @@
-From 22eb50697152295a5a00c5913b72ae16c0d43599 Mon Sep 17 00:00:00 2001
+From ef5ce2cb4f6018432b53a8520088165d6c002570 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 50a49f59b..d57aafb6a 100644
+index 21baee319..2d1c2049b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1209,6 +1209,15 @@ public class CraftWorld implements World {
+@@ -1210,6 +1210,15 @@ public class CraftWorld implements World {
          return list;
      }
  
@@ -25,5 +25,5 @@ index 50a49f59b..d57aafb6a 100644
      public void save() {
          org.spigotmc.AsyncCatcher.catchOp("world save"); // Spigot
 -- 
-2.23.0
+2.22.1
 

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

@@ -1,4 +1,4 @@
-From 868e01ec8a8ef2b709271eb8ad7bc05166bd876a Mon Sep 17 00:00:00 2001
+From 86f8e6890dfd2a556738602dcdccd2ecfb66eb23 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 a0465c85f..55d469e37 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 1adc71021..d74ec389a 100644
+index 501040d02..bf19f0530 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2014,7 +2014,7 @@ public class CraftWorld implements World {
+@@ -2015,7 +2015,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);
@@ -81,5 +81,5 @@ index 1adc71021..d74ec389a 100644
  
      private static Map<String, GameRules.GameRuleKey<?>> gamerules;
 -- 
-2.23.0
+2.22.1
 

Spigot-Server-Patches/0298-Add-ray-tracing-methods-to-LivingEntity.patch

@@ -1,11 +1,11 @@
-From 06c4452e3e07fe002dc02aff0a6327d251746592 Mon Sep 17 00:00:00 2001
+From 80d0aefd27b4ddcde79903d48826b3366fa64d4a Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 3 Sep 2018 18:20:03 -0500
 Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index dbf42f882f..b09712ca91 100644
+index dbf42f882..b09712ca9 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -3177,6 +3177,23 @@ public abstract class EntityLiving extends Entity {
@@ -33,10 +33,10 @@ index dbf42f882f..b09712ca91 100644
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 0610d0d5c0..408028131b 100644
+index 379239567..6f4c6c589 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -182,6 +182,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -195,6 +195,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
          return blocks.get(0);
      }
  
@@ -66,5 +66,5 @@ index 0610d0d5c0..408028131b 100644
      public List<Block> getLastTwoTargetBlocks(Set<Material> transparent, int maxDistance) {
          return getLineOfSight(transparent, maxDistance, 2);
 -- 
-2.22.0
+2.22.1
 

Spigot-Server-Patches/0304-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch

@@ -1,4 +1,4 @@
-From 5264ba62e7d1b5b7871e23d26e9b9c614d80e65e Mon Sep 17 00:00:00 2001
+From 724171bb537ec24550e0e1623515e1c1f083a78a Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 12 Sep 2018 18:53:55 +0300
 Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values
@@ -32,7 +32,7 @@ index 005ebec26..97d85f845 100644
          this.s = this::l;
          if (this.i.canRead() && this.i.peek() == '#') {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 7a7e96926..432624056 100644
+index ac6ff834c..e96960d27 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -87,6 +87,12 @@ import org.bukkit.persistence.PersistentDataContainer;
@@ -432,5 +432,5 @@ index 7a7e96926..432624056 100644
 +    // Paper end
  }
 -- 
-2.23.0
+2.22.1
 

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

@@ -1,11 +1,11 @@
-From 8f2a9a05ad3501a4821915bc0e935b370bea5418 Mon Sep 17 00:00:00 2001
+From d6ac301c41ce6cf739582b3dc2d2c250de86f591 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
 
 
 diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
-index 4f60b931a1..c950139c0f 100644
+index 4f60b931a..c950139c0 100644
 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
 +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
 @@ -108,6 +108,7 @@ public class AxisAlignedBB {
@@ -46,7 +46,7 @@ index 4f60b931a1..c950139c0f 100644
          double[] adouble = new double[]{1.0D};
          double d0 = vec3d1.x - vec3d.x;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 75da085969..046e7e031c 100644
+index 75da08596..046e7e031 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1497,6 +1497,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -66,7 +66,7 @@ index 75da085969..046e7e031c 100644
          return 0.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index d23968a7c9..31d14b19b1 100644
+index d23968a7c..31d14b19b 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -3229,6 +3229,37 @@ public abstract class EntityLiving extends Entity {
@@ -108,7 +108,7 @@ index d23968a7c9..31d14b19b1 100644
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/net/minecraft/server/IEntitySelector.java b/src/main/java/net/minecraft/server/IEntitySelector.java
-index 9bf1919451..56488b78dd 100644
+index 9bf191945..56488b78d 100644
 --- a/src/main/java/net/minecraft/server/IEntitySelector.java
 +++ b/src/main/java/net/minecraft/server/IEntitySelector.java
 @@ -18,6 +18,7 @@ public final class IEntitySelector {
@@ -120,10 +120,10 @@ index 9bf1919451..56488b78dd 100644
          return !entity.isSpectator();
      };
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 408028131b..e0de3820f3 100644
+index 6f4c6c589..b27fd44dc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -202,6 +202,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -215,6 +215,33 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
              new com.destroystokyo.paper.block.TargetBlockInfo(org.bukkit.craftbukkit.block.CraftBlock.at(getHandle().world, ((net.minecraft.server.MovingObjectPositionBlock)rayTrace).getBlockPosition()),
                  net.minecraft.server.MCUtil.toBukkitBlockFace(((net.minecraft.server.MovingObjectPositionBlock)rayTrace).getDirection()));
      }
@@ -158,5 +158,5 @@ index 408028131b..e0de3820f3 100644
  
      @Override
 -- 
-2.22.0
+2.22.1
 

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

@@ -1,4 +1,4 @@
-From 96966a820a0d86cf65fd11ce4d01850e23d8106a Mon Sep 17 00:00:00 2001
+From b8586534d4fda7c137a2aad496f1bb18e2c4264e 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
@@ -10,7 +10,7 @@ persistenting Living Entity, SPAWNER for spawners,
 or DEFAULT since data was not stored.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 046e7e031c..f87514a200 100644
+index 046e7e031..f87514a20 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -68,6 +68,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -59,7 +59,7 @@ index 046e7e031c..f87514a200 100644
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 65df0e7c8c..abddc8895e 100644
+index 65df0e7c8..abddc8895 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -250,7 +250,7 @@ public abstract class PlayerList {
@@ -72,7 +72,7 @@ index 65df0e7c8c..abddc8895e 100644
              });
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index b01af00c86..192b3be1f0 100644
+index 62f9a068f..956740dcd 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -943,6 +943,7 @@ public class WorldServer extends World {
@@ -84,10 +84,10 @@ index b01af00c86..192b3be1f0 100644
          if (entity.valid) {
              MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 1cd3448e57..15042943c9 100644
+index 517e42218..31db42e9f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-@@ -1053,5 +1053,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -1054,5 +1054,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
      public boolean fromMobSpawner() {
          return getHandle().spawnedViaMobSpawner;
      }
@@ -99,5 +99,5 @@ index 1cd3448e57..15042943c9 100644
      // Paper end
  }
 -- 
-2.22.0
+2.22.1
 

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

@@ -1,4 +1,4 @@
-From 0a2f16aa2502f4b1b923430bfe2bb3207be3d516 Mon Sep 17 00:00:00 2001
+From 98fee3fca57d0ba5ee3f5aaee63d03ca99cf8063 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
@@ -196,10 +196,10 @@ index 0f8f54d8e..8a3124fed 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 67f0f9a89..c49b74c68 100644
+index 38939ce81..0c31c349a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1852,15 +1852,21 @@ public class CraftWorld implements World {
+@@ -1853,15 +1853,21 @@ public class CraftWorld implements World {
  
      @Override
      public void setKeepSpawnInMemory(boolean keepLoaded) {
@@ -226,5 +226,5 @@ index 67f0f9a89..c49b74c68 100644
  
      @Override
 -- 
-2.23.0
+2.22.1
 

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

@@ -1,4 +1,4 @@
-From b0905f4b72eaba949fcedd2c1fdbbb90d24aced4 Mon Sep 17 00:00:00 2001
+From db3abe86c6ce324523f6779e108e91cf8da1d4fd 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
@@ -3777,7 +3777,7 @@ index f1ad7be75..0c1f4e6e1 100644
  
      public void doTick(BooleanSupplier booleansupplier) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 088f0800f..5e552029a 100644
+index 4a035f0f0..3d5aa7e8d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -553,22 +553,23 @@ public class CraftWorld implements World {
@@ -3812,7 +3812,7 @@ index 088f0800f..5e552029a 100644
  
              // fall through to load
              // we do this so we do not re-read the chunk data on disk
-@@ -2324,6 +2325,25 @@ public class CraftWorld implements World {
+@@ -2325,6 +2326,25 @@ public class CraftWorld implements World {
          return persistentRaid.a.values().stream().map(CraftRaid::new).collect(Collectors.toList());
      }
  

work/Bukkit

@@ -1 +1 @@
-Subproject commit 92f24ff245ea60fc4d9cff5bac8775d7caf6f3e9
+Subproject commit 6527cb5892a720b64e529f0ee53830bc168760aa

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 03b145b3006de982c7be3580dd85dd619b2b172b
+Subproject commit a3fdef8c3242a62668948d9384acb6760800b6a9

work/Spigot

@@ -1 +1 @@
-Subproject commit 065a3734e85cc81787512247ef77a3a474b67f1b
+Subproject commit 94af569b998f05b9380433f660f075efa0f2f0b0