mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 01:47:42 +01:00
Fix lava under furnace
This commit is contained in:
@@ -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
|
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
|
--- a/src/main/java/net/minecraft/world/level/block/entity/AbstractFurnaceBlockEntity.java
|
||||||
+++ b/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;
|
@@ -43,6 +43,7 @@ import net.minecraft.world.level.Level;
|
||||||
@@ -16,10 +16,10 @@ index 4977f3fad3bfc12fd4c5f9fbe8beea2895247c57..800c80398acb007ae71b06d1a887aa15
|
|||||||
import net.minecraft.world.phys.Vec3;
|
import net.minecraft.world.phys.Vec3;
|
||||||
// CraftBukkit start
|
// CraftBukkit start
|
||||||
import org.bukkit.craftbukkit.block.CraftBlock;
|
import org.bukkit.craftbukkit.block.CraftBlock;
|
||||||
@@ -332,6 +333,22 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
|
@@ -329,6 +330,21 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
|
||||||
boolean flag2 = !((ItemStack) blockEntity.items.get(0)).isEmpty();
|
}
|
||||||
boolean flag3 = !itemstack.isEmpty();
|
|
||||||
|
|
||||||
|
ItemStack itemstack = (ItemStack) blockEntity.items.get(1);
|
||||||
+ // Purpur start
|
+ // Purpur start
|
||||||
+ boolean usedLavaFromUnderneath = false;
|
+ boolean usedLavaFromUnderneath = false;
|
||||||
+ if (world.purpurConfig.furnaceUseLavaFromUnderneath && !blockEntity.isLit() && itemstack.isEmpty() && !blockEntity.items.get(0).isEmpty() && world.getGameTime() % 20 == 0) {
|
+ 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
|
+ // Purpur end
|
||||||
+
|
boolean flag2 = !((ItemStack) blockEntity.items.get(0)).isEmpty();
|
||||||
if (!blockEntity.isLit() && (!flag3 || !flag2)) {
|
boolean flag3 = !itemstack.isEmpty();
|
||||||
if (!blockEntity.isLit() && blockEntity.cookingProgress > 0) {
|
|
||||||
blockEntity.cookingProgress = Mth.clamp(blockEntity.cookingProgress - 2, (int) 0, blockEntity.cookingTotalTime);
|
@@ -414,6 +430,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
|
||||||
@@ -414,6 +431,7 @@ public abstract class AbstractFurnaceBlockEntity extends BaseContainerBlockEntit
|
|
||||||
setChanged(world, pos, state);
|
setChanged(world, pos, state);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user