From 6cb42c485bce36bcb1732d880ceb3f4ac236aecb Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Fri, 16 Jul 2021 18:48:27 -0700
Subject: [PATCH] Updated Upstream (Bukkit/CraftBukkit/Spigot) (#6209)

---
 .../server/Implement-furnace-cook-speed-multiplier-API.patch    | 2 +-
 work/Bukkit                                                     | 2 +-
 work/CraftBukkit                                                | 2 +-
 work/Spigot                                                     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/patches/server/Implement-furnace-cook-speed-multiplier-API.patch b/patches/server/Implement-furnace-cook-speed-multiplier-API.patch
index 837e4e19b6..6d98967ee2 100644
--- a/patches/server/Implement-furnace-cook-speed-multiplier-API.patch
+++ b/patches/server/Implement-furnace-cook-speed-multiplier-API.patch
@@ -43,8 +43,8 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          CompoundTag nbttagcompound1 = new CompoundTag();
  
 @@ -0,0 +0,0 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
+                 // CraftBukkit end
  
-             if (blockEntity.isLit() && AbstractFurnaceBlockEntity.canBurn(irecipe, blockEntity.items, i)) {
                  ++blockEntity.cookingProgress;
 -                if (blockEntity.cookingProgress == blockEntity.cookingTotalTime) {
 +                if (blockEntity.cookingProgress >= blockEntity.cookingTotalTime) { // Paper - cook speed multiplier API
diff --git a/work/Bukkit b/work/Bukkit
index 17c35d6eb0..5662c2b305 160000
--- a/work/Bukkit
+++ b/work/Bukkit
@@ -1 +1 @@
-Subproject commit 17c35d6eb0d303a9047e41855c9a297e9bd1872b
+Subproject commit 5662c2b3053b90258e479097bd68d21236018b1d
diff --git a/work/CraftBukkit b/work/CraftBukkit
index a6292cc3c4..4e1870454c 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit a6292cc3c4fe5c901d0c959747c88991e185249f
+Subproject commit 4e1870454ce16c8e6dcd761c23bd7aec6a59a879
diff --git a/work/Spigot b/work/Spigot
index eac3cd9639..38e6c03da1 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit eac3cd963927641565f43f09f7a127cfeaa3447f
+Subproject commit 38e6c03da15d7fc0d08e5ab9b09d3e0acdd470e3