Updated Upstream (Bukkit/CraftBukkit) (#8430)

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:
09943450 Update SnakeYAML version
5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc
6f82b381 PR-788: Add getHand() to all relevant events

CraftBukkit Changes:
aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe
5329dd6fd PR-1107: Add getHand() to all relevant events
93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY

1 files changed, 44 insertions, 0 deletions

diff --git a/patches/api/0280-add-consumeFuel-to-FurnaceBurnEvent.patch b/patches/api/0280-add-consumeFuel-to-FurnaceBurnEvent.patch
new file mode 100644
index 0000000000..6c8b681cd9
--- /dev/null
+++ b/patches/api/0280-add-consumeFuel-to-FurnaceBurnEvent.patch
@@ -0,0 +1,44 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <[email protected]>
+Date: Thu, 22 Apr 2021 16:45:15 -0700
+Subject: [PATCH] add consumeFuel to FurnaceBurnEvent
+
+
+diff --git a/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java b/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java
+index bc71bc2d3ace0d19d730c09f05f9e0655bcee8f5..caef53d0f6546516fa7aabb2cb3abed70808b3ba 100644
+--- a/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java
++++ b/src/main/java/org/bukkit/event/inventory/FurnaceBurnEvent.java
+@@ -16,6 +16,7 @@ public class FurnaceBurnEvent extends BlockEvent implements Cancellable {
+     private int burnTime;
+     private boolean cancelled;
+     private boolean burning;
++    private boolean consumeFuel = true; // Paper
+ 
+     public FurnaceBurnEvent(@NotNull final Block furnace, @NotNull final ItemStack fuel, final int burnTime) {
+         super(furnace);
+@@ -70,6 +71,25 @@ public class FurnaceBurnEvent extends BlockEvent implements Cancellable {
+     public void setBurning(boolean burning) {
+         this.burning = burning;
+     }
++    // Paper start
++    /**
++     * Gets whether the furnace's fuel will be consumed or not.
++     *
++     * @return whether the furnace's fuel will be consumed
++     */
++    public boolean willConsumeFuel() {
++        return consumeFuel;
++    }
++
++    /**
++     * Sets whether the furnace's fuel will be consumed or not.
++     *
++     * @param consumeFuel true to consume the fuel
++     */
++    public void setConsumeFuel(boolean consumeFuel) {
++        this.consumeFuel = consumeFuel;
++    }
++    // Paper end
+ 
+     @Override
+     public boolean isCancelled() {