From 41fd6ef6050e143f9786fd35a866f7cbf8f893ad Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Thu, 9 Jun 2022 22:34:54 -0500 Subject: [PATCH] Fix lava under furnace --- ...0104-Furnace-uses-lava-from-underneath.patch | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/patches/server/0104-Furnace-uses-lava-from-underneath.patch b/patches/server/0104-Furnace-uses-lava-from-underneath.patch index d28dbf21e..05067514e 100644 --- a/patches/server/0104-Furnace-uses-lava-from-underneath.patch +++ b/patches/server/0104-Furnace-uses-lava-from-underneath.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Furnace uses lava from underneath diff --git a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java -index 4977f3fad3bfc12fd4c5f9fbe8beea2895247c57..800c80398acb007ae71b06d1a887aa159e866eda 100644 +index 4977f3fad3bfc12fd4c5f9fbe8beea2895247c57..c617a8aacbbefb37d53d0e005e822469d29aa642 100644 --- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java +++ b/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java @@ -43,6 +43,7 @@ import net.minecraft.world.level.Level; @@ -16,10 +16,10 @@ index 4977f3fad3bfc12fd4c5f9fbe8beea2895247c57..800c80398acb007ae71b06d1a887aa15 import net.minecraft.world.phys.Vec3; // CraftBukkit start import org.bukkit.craftbukkit.block.CraftBlock; -@@ -332,6 +333,22 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit - boolean flag2 = !((ItemStack) blockEntity.items.get(0)).isEmpty(); - boolean flag3 = !itemstack.isEmpty(); +@@ -329,6 +330,21 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit + } + ItemStack itemstack = (ItemStack) blockEntity.items.get(1); + // Purpur start + boolean usedLavaFromUnderneath = false; + if (world.purpurConfig.furnaceUseLavaFromUnderneath && !blockEntity.isLit() && itemstack.isEmpty() && !blockEntity.items.get(0).isEmpty() && world.getGameTime() % 20 == 0) { @@ -35,11 +35,10 @@ index 4977f3fad3bfc12fd4c5f9fbe8beea2895247c57..800c80398acb007ae71b06d1a887aa15 + } + } + // Purpur end -+ - if (!blockEntity.isLit() && (!flag3 || !flag2)) { - if (!blockEntity.isLit() && blockEntity.cookingProgress > 0) { - blockEntity.cookingProgress = Mth.clamp(blockEntity.cookingProgress - 2, (int) 0, blockEntity.cookingTotalTime); -@@ -414,6 +431,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit + boolean flag2 = !((ItemStack) blockEntity.items.get(0)).isEmpty(); + boolean flag3 = !itemstack.isEmpty(); + +@@ -414,6 +430,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit setChanged(world, pos, state); }