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

2024-12-28 20:07:41 +01:00 · 2021-07-16 18:48:27 -07:00 · 2021-07-16 18:48:27 -07:00 · 6cb42c485b
commit 6cb42c485b
parent b166af8801
4 changed files with 4 additions and 4 deletions
--- 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
--- a/work/Bukkit
+++ b/work/Bukkit
@ -1 +1 @@
-Subproject commit 17c35d6eb0d303a9047e41855c9a297e9bd1872b
+Subproject commit 5662c2b3053b90258e479097bd68d21236018b1d
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@ -1 +1 @@
-Subproject commit a6292cc3c4fe5c901d0c959747c88991e185249f
+Subproject commit 4e1870454ce16c8e6dcd761c23bd7aec6a59a879
--- a/work/Spigot
+++ b/work/Spigot
@ -1 +1 @@
-Subproject commit eac3cd963927641565f43f09f7a127cfeaa3447f
+Subproject commit 38e6c03da15d7fc0d08e5ab9b09d3e0acdd470e3