Anvilcraft/buildcraft
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

further engine fixes

Browse source
This commit is contained in:
asiekierka 2015-10-06 14:10:26 +02:00
parent 4152cd796c
commit b9f16462d8
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/buildcraft/core/TileEngineWood.java
View file

@ -41,6 +41,7 @@ public class TileEngineWood extends TileEngineBase implements IRedstoneEngine {
}
}
@Override
public int getCurrentOutputLimit() {
return 10;
}

6
common/buildcraft/energy/TileEngineIron.java
View file

@ -377,6 +377,10 @@ public class TileEngineIron extends TileEngineWithInventory implements IFluidHan
@Override
public int fill(ForgeDirection from, FluidStack resource, boolean doFill) {
if (resource == null || resource.getFluid() == null) {
return 0;
}
if (BuildcraftFuelRegistry.coolant.getCoolant(resource.getFluid()) != null) {
return tankCoolant.fill(resource, doFill);
} else if (BuildcraftFuelRegistry.fuel.getFuel(resource.getFluid()) != null) {
@ -392,7 +396,7 @@ public class TileEngineIron extends TileEngineWithInventory implements IFluidHan
@Override
public boolean canFill(ForgeDirection from, Fluid fluid) {
return from != orientation &&
return from != orientation && fluid != null &&
(BuildcraftFuelRegistry.coolant.getCoolant(fluid) != null ||
BuildcraftFuelRegistry.fuel.getFuel(fluid) != null);
}