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

Upstream has released updates that appear 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:
9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent
258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor
ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD

CraftBukkit Changes:
98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire
a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent
5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class
76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor

Spigot Changes:
e9ec5485 Rebuild patches
f1b62e0c Rebuild patches

1 files changed, 63 insertions, 0 deletions

diff --git a/patches/api/0315-Get-entity-default-attributes.patch b/patches/api/0315-Get-entity-default-attributes.patch
new file mode 100644
index 0000000000..60dc6739f1
--- /dev/null
+++ b/patches/api/0315-Get-entity-default-attributes.patch
@@ -0,0 +1,63 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Fri, 20 Aug 2021 13:03:55 -0700
+Subject: [PATCH] Get entity default attributes
+
+
+diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
+index bdee63fb97cbc0c9fbe7df74de5cb5f4ed7de3ca..5d4721595a24c8c970f2500fc805c3efc4508157 100644
+--- a/src/main/java/org/bukkit/UnsafeValues.java
++++ b/src/main/java/org/bukkit/UnsafeValues.java
+@@ -213,5 +213,22 @@ public interface UnsafeValues {
+      * @return the server's protocol version
+      */
+     int getProtocolVersion();
++
++    /**
++     * Checks if the entity represented by the namespaced key has default attributes.
++     *
++     * @param entityKey the entity's key
++     * @return true if it has default attributes
++     */
++    boolean hasDefaultEntityAttributes(@org.jetbrains.annotations.NotNull NamespacedKey entityKey);
++
++    /**
++     * Gets the default attributes for the entity represented by the namespaced key.
++     *
++     * @param entityKey the entity's key
++     * @return an unmodifiable instance of Attributable for reading default attributes.
++     * @throws IllegalArgumentException if the entity does not exist of have default attributes (use {@link #hasDefaultEntityAttributes(NamespacedKey)} first)
++     */
++    @org.jetbrains.annotations.NotNull org.bukkit.attribute.Attributable getDefaultEntityAttributes(@org.jetbrains.annotations.NotNull NamespacedKey entityKey);
+     // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
+index 550d66e0d41878717c6a92caade4a8413674f012..4aaf268f58038cd5d4101ec3fbfdc20b544d6678 100644
+--- a/src/main/java/org/bukkit/entity/EntityType.java
++++ b/src/main/java/org/bukkit/entity/EntityType.java
+@@ -457,6 +457,25 @@ public enum EntityType implements Keyed, Translatable, net.kyori.adventure.trans
+         Preconditions.checkArgument(this != UNKNOWN, "UNKNOWN entities do not have translation keys");
+         return org.bukkit.Bukkit.getUnsafe().getTranslationKey(this);
+     }
++
++    /**
++     * Checks if the entity has default attributes.
++     *
++     * @return true if it has default attributes
++     */
++    public boolean hasDefaultAttributes() {
++        return org.bukkit.Bukkit.getUnsafe().hasDefaultEntityAttributes(this.key);
++    }
++
++    /**
++     * Gets the default attributes for the entity.
++     *
++     * @return an unmodifiable instance of Attributable for reading default attributes.
++     * @throws IllegalArgumentException if the entity does not exist of have default attributes (use {@link #hasDefaultAttributes()} first)
++     */
++    public @NotNull org.bukkit.attribute.Attributable getDefaultAttributes() {
++        return org.bukkit.Bukkit.getUnsafe().getDefaultEntityAttributes(this.key);
++    }
+     // Paper end
+ 
+     /**