tilera/Mekanism-tilera-Edition
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed Heat Generator conflict

Browse source
This commit is contained in:
Aidan Brady 2012-12-27 14:39:24 -05:00
parent 5ff5a5bac0
commit af335b35ab
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/minecraft/mekanism/generators/common/TileEntityHeatGenerator.java
View file

@ -37,7 +37,9 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements ITan
@Override
public void onUpdate()
{
{
super.onUpdate();
if(inventory[1] != null && electricityStored > 0)
{
if(inventory[1].getItem() instanceof IItemElectric)
@ -97,18 +99,6 @@ public class TileEntityHeatGenerator extends TileEntityGenerator implements ITan
{
fuelSlot.liquidStored += fuel;
--inventory[0].stackSize;
<<<<<<< HEAD
if(prevStack != null && Mekanism.hooks.BuildCraftFuelBucket != null)
{
if(prevStack.itemID == Mekanism.hooks.BuildCraftFuelBucket.itemID)
{
inventory[0] = Mekanism.hooks.BuildCraftFuelBucket;
}
}
=======
>>>>>>> v5.0.2 Release
}
if(inventory[0].stackSize == 0)