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, 0 insertions, 57 deletions

diff --git a/patches/api/0369-Collision-API.patch b/patches/api/0369-Collision-API.patch
deleted file mode 100644
index fc4f5486d9..0000000000
--- a/patches/api/0369-Collision-API.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Owen1212055 <[email protected]>
-Date: Wed, 6 Oct 2021 20:10:36 -0400
-Subject: [PATCH] Collision API
-
-
-diff --git a/src/main/java/org/bukkit/RegionAccessor.java b/src/main/java/org/bukkit/RegionAccessor.java
-index 44ee56a5956cc17194c767a0c1071a2abffe818a..43dd6c59cceba12f27e6b265acc3ad97eea37abd 100644
---- a/src/main/java/org/bukkit/RegionAccessor.java
-+++ b/src/main/java/org/bukkit/RegionAccessor.java
-@@ -493,5 +493,15 @@ public interface RegionAccessor extends Keyed { // Paper
-      * @return whether a line of sight exists between {@code from} and {@code to}
-      */
-     public boolean lineOfSightExists(@NotNull Location from, @NotNull Location to);
-+
-+    /**
-+     * Checks if the world collides with the given boundingbox.
-+     * This will check for any colliding hard entities (boats, shulkers) / worldborder / blocks.
-+     * Does not load chunks that are within the bounding box.
-+     *
-+     * @param boundingBox the box to check collisions in
-+     * @return collides or not
-+     */
-+    boolean hasCollisionsIn(@NotNull org.bukkit.util.BoundingBox boundingBox);
-     // Paper end
- }
-diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
-index 948d6a08ff459afd5d4d5b151c41d94d1d5847b6..4ea16c106cfab12ebc753781fb7f406330c3f25c 100644
---- a/src/main/java/org/bukkit/entity/Entity.java
-+++ b/src/main/java/org/bukkit/entity/Entity.java
-@@ -968,4 +968,26 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
-      */
-     boolean isInPowderedSnow();
-     // Paper end
-+
-+    // Paper start - Collision API
-+    /**
-+     * Checks for any collisions with the entity's bounding box at the provided location.
-+     * This will check for any colliding entities (boats, shulkers) / worldborder / blocks.
-+     * Does not load chunks that are within the bounding box at the specified location.
-+     *
-+     * @param location the location to check collisions in
-+     * @return collides or not
-+     */
-+    boolean collidesAt(@NotNull Location location);
-+
-+    /**
-+     * This checks using the given boundingbox as the entity's boundingbox if the entity would collide with anything.
-+     * This will check for any colliding entities (boats, shulkers) / worldborder / blocks.
-+     * Does not load chunks that are within the bounding box.
-+     *
-+     * @param boundingBox the box to check collisions in
-+     * @return collides or not
-+     */
-+    boolean wouldCollideUsing(@NotNull BoundingBox boundingBox);
-+    // Paper end - Collision API
- }