Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix infinite furnaces leaving empty buckets

Browse Source
This commit is contained in:
BillyGalbreath
2020-12-05 21:25:18 -06:00
parent 6cf16723f4
commit a989361e39
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
patches/server/0133-Infinite-fuel-furnace.patch
View File

@@ -5,19 +5,21 @@ Subject: [PATCH] Infinite fuel furnace
diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
index 1d3c2dd936..e96fc0420a 100644
index 1d3c2dd936..dfed2675a8 100644
--- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
+++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
@@ -266,6 +266,16 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
@@ -266,6 +266,18 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
if (!this.world.isClientSide) {
ItemStack itemstack = (ItemStack) this.items.get(1);
+ // Purpur start
+ boolean infiniteFuel = false;
+ if (world.purpurConfig.furnaceInfiniteFuel && !isBurning() && itemstack.isEmpty() && !items.get(0).isEmpty() && world.getTime() % 20 == 0) {
+ BlockPosition pos = getPosition().down();
+ if (world.getBlockIfLoaded(pos).getItem() == Blocks.LAVA.getItem()) {
+ world.setTypeAndData(pos, Blocks.AIR.getBlockData(), 3);
+ itemstack = Items.LAVA_BUCKET.createItemStack();
+ infiniteFuel = true;
+ }
+ }
+ // Purpur end
@@ -25,6 +27,15 @@ index 1d3c2dd936..e96fc0420a 100644
if (!this.isBurning() && (itemstack.isEmpty() || ((ItemStack) this.items.get(0)).isEmpty())) {
if (!this.isBurning() && this.cookTime > 0) {
this.cookTime = MathHelper.clamp(this.cookTime - 2, 0, this.cookTimeTotal);
@@ -319,6 +331,8 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
flag1 = true;
this.world.setTypeAndData(this.position, (IBlockData) this.world.getType(this.position).set(BlockFurnace.LIT, this.isBurning()), 3);
}
+
+ if (infiniteFuel) this.items.set(1, ItemStack.NULL_ITEM); // Purpur
}
if (flag1) {
diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
index e64cbed34e..9a595c2f91 100644
--- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java