From 7e63e4fd8a705391c45e5940e00cda5964fbfd01 Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sun, 13 Aug 2017 10:31:37 +1000 Subject: $ Fixed Thermal Boiler not giving Obsidian when a Lava filter was not present. (Original Behaviour) --- .../tileentities/machines/multi/GT4Entity_ThermalBoiler.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GT4Entity_ThermalBoiler.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GT4Entity_ThermalBoiler.java index b1b1b7cc6f..e6ff3593d9 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GT4Entity_ThermalBoiler.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GT4Entity_ThermalBoiler.java @@ -71,8 +71,9 @@ extends GT_MetaTileEntity_MultiBlockBase this.mEUt = getEUt(); this.mEfficiencyIncrease = (this.mMaxProgresstime * getEfficiencyIncrease()); + int loot_MAXCHANCE = 100000; if (ItemList.Component_LavaFilter.get(1L).getClass().isInstance(aStack)) { - int loot_MAXCHANCE = 100000; + if ((tRecipe.getOutput(0) != null) && (getBaseMetaTileEntity().getRandomNumber(loot_MAXCHANCE) < tRecipe.getOutputChance(0))) { this.mOutputItems = new ItemStack[] { GT_Utility.copy(new Object[] { tRecipe.getOutput(0) }) }; } @@ -91,11 +92,16 @@ extends GT_MetaTileEntity_MultiBlockBase if ((tRecipe.getOutput(5) != null) && (getBaseMetaTileEntity().getRandomNumber(loot_MAXCHANCE) < tRecipe.getOutputChance(5))) { this.mOutputItems = new ItemStack[] { GT_Utility.copy(new Object[] { tRecipe.getOutput(5) }) }; } + + } + //Give Obsidian without Lava Filter + if (tFluid.isFluidEqual(GT_ModHandler.getLava(86))){ if ((tRecipe.getOutput(6) != null) && (getBaseMetaTileEntity().getRandomNumber(loot_MAXCHANCE) < tRecipe.getOutputChance(6))) { this.mOutputItems = new ItemStack[] { GT_Utility.copy(new Object[] { tRecipe.getOutput(6) }) }; } } + return true; } } -- cgit