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

Please note that this build includes changes to meet upstreams
requirements for nullability annotations. While we aim for a level of
accuracy, these might not be 100% correct, if there are any issues,
please speak to us on discord, or open an issue on the tracker to
discuss.

Bukkit Changes:
9a6a1de3 Remove nullability annotations from enum constructors
3f0591ea SPIGOT-2540: Add nullability annotations to entire Bukkit API

CraftBukkit Changes:
8d8475fc SPIGOT-4666: Force parameter in HumanEntity#sleep
8b1588e2 Fix ExplosionPrimeEvent#setFire not working with EnderCrystals
39a287b7 Don't ignore newlines in PlayerListHeader/Footer

Spigot Changes:
cf694d87 Add nullability annotations

Spigot-API-Patches/RangedEntity-API.patch

@@ -8,7 +8,7 @@ and to perform an attack.
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java b/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java
 new file mode 100644
-index 00000000..8234de28
+index 000000000..f2e3233a3
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/RangedEntity.java
 @@ -0,0 +0,0 @@
@@ -16,6 +16,7 @@ index 00000000..8234de28
 +
 +import org.bukkit.entity.LivingEntity;
 +import org.bukkit.entity.Mob;
++import org.jetbrains.annotations.NotNull;
 +
 +public interface RangedEntity extends Mob {
 +    /**
@@ -25,7 +26,7 @@ index 00000000..8234de28
 +     * @param charge How "charged" the attack is (how far back the bow was pulled for Bow attacks).
 +     *               This should be a value between 0 and 1, represented as targetDistance/maxDistance.
 +     */
-+    void rangedAttack(LivingEntity target, float charge);
++    void rangedAttack(@NotNull LivingEntity target, float charge);
 +
 +    /**
 +     * Sets that the Entity is "charging" up an attack, by raising its hands
@@ -43,7 +44,7 @@ index 00000000..8234de28
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Illusioner.java b/src/main/java/org/bukkit/entity/Illusioner.java
-index 7c92c431..14e6c5ee 100644
+index 7c92c431b..14e6c5ee0 100644
 --- a/src/main/java/org/bukkit/entity/Illusioner.java
 +++ b/src/main/java/org/bukkit/entity/Illusioner.java
 @@ -0,0 +0,0 @@
@@ -59,7 +60,7 @@ index 7c92c431..14e6c5ee 100644
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Llama.java b/src/main/java/org/bukkit/entity/Llama.java
-index 9422d56c..92c30ed5 100644
+index c43854298..d23226ccb 100644
 --- a/src/main/java/org/bukkit/entity/Llama.java
 +++ b/src/main/java/org/bukkit/entity/Llama.java
 @@ -0,0 +0,0 @@
@@ -67,6 +68,7 @@ index 9422d56c..92c30ed5 100644
  
 +import com.destroystokyo.paper.entity.RangedEntity;
  import org.bukkit.inventory.LlamaInventory;
+ import org.jetbrains.annotations.NotNull;
  
  /**
   * Represents a Llama.
@@ -77,14 +79,15 @@ index 9422d56c..92c30ed5 100644
      /**
       * Represents the base color that the llama has.
 diff --git a/src/main/java/org/bukkit/entity/Skeleton.java b/src/main/java/org/bukkit/entity/Skeleton.java
-index e33d00b3..40157bef 100644
+index 2ac30c0f6..d42a4e12c 100644
 --- a/src/main/java/org/bukkit/entity/Skeleton.java
 +++ b/src/main/java/org/bukkit/entity/Skeleton.java
-@@ -0,0 +0,0 @@
- package org.bukkit.entity;
+@@ -0,0 +0,0 @@ package org.bukkit.entity;
  
+ import org.jetbrains.annotations.Contract;
+ import org.jetbrains.annotations.NotNull;
 +import com.destroystokyo.paper.entity.RangedEntity;
-+
+ 
  /**
   * Represents a Skeleton.
   */
@@ -94,7 +97,7 @@ index e33d00b3..40157bef 100644
      /**
       * Gets the current type of this skeleton.
 diff --git a/src/main/java/org/bukkit/entity/Snowman.java b/src/main/java/org/bukkit/entity/Snowman.java
-index 818efe2a..10f8f6d4 100644
+index 818efe2a4..10f8f6d45 100644
 --- a/src/main/java/org/bukkit/entity/Snowman.java
 +++ b/src/main/java/org/bukkit/entity/Snowman.java
 @@ -0,0 +0,0 @@
@@ -111,7 +114,7 @@ index 818efe2a..10f8f6d4 100644
      /**
       * Gets whether this snowman is in "derp mode", meaning it is not wearing a
 diff --git a/src/main/java/org/bukkit/entity/Witch.java b/src/main/java/org/bukkit/entity/Witch.java
-index 9c5dc1f9..4b27f689 100644
+index 9c5dc1f97..4b27f6890 100644
 --- a/src/main/java/org/bukkit/entity/Witch.java
 +++ b/src/main/java/org/bukkit/entity/Witch.java
 @@ -0,0 +0,0 @@
@@ -126,7 +129,7 @@ index 9c5dc1f9..4b27f689 100644
 +public interface Witch extends Monster, RangedEntity { // Paper
  }
 diff --git a/src/main/java/org/bukkit/entity/Wither.java b/src/main/java/org/bukkit/entity/Wither.java
-index 3bc332ee..426d3693 100644
+index 3bc332ee7..426d36933 100644
 --- a/src/main/java/org/bukkit/entity/Wither.java
 +++ b/src/main/java/org/bukkit/entity/Wither.java
 @@ -0,0 +0,0 @@