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

fix #2179, fix #2185

Browse source
This commit is contained in:
Adrian Siekierka 2014-11-10 18:14:00 +01:00
parent 93c28597b4
commit df7b082c25
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/buildcraft/builders/TileBuilder.java
View file

@ -311,6 +311,10 @@ public class TileBuilder extends TileAbstractBuilder implements IHasWork, IFluid
@Deprecated @Deprecated
public BptBuilderBase instanciateBluePrintBuilder(int x, int y, int z, ForgeDirection o) { public BptBuilderBase instanciateBluePrintBuilder(int x, int y, int z, ForgeDirection o) {
BlueprintBase bpt = instanciateBlueprint(); BlueprintBase bpt = instanciateBlueprint();
if (bpt == null) {
return null;
}
bpt = bpt.adjustToWorld(worldObj, x, y, z, o); bpt = bpt.adjustToWorld(worldObj, x, y, z, o);
if (getStackInSlot(0).getItem() instanceof ItemBlueprintStandard) { if (getStackInSlot(0).getItem() instanceof ItemBlueprintStandard) {

2
common/buildcraft/transport/pipes/PipePowerWood.java
View file

@ -222,7 +222,7 @@ public class PipePowerWood extends Pipe<PipeTransportPower> implements IPowerRec
@Override @Override
public int receiveEnergy(ForgeDirection from, int maxReceive, public int receiveEnergy(ForgeDirection from, int maxReceive,
boolean simulate) { boolean simulate) {
if (powerSources[from.ordinal()]) { if (from.ordinal() < 6 && powerSources[from.ordinal()]) {
return battery.receiveEnergy(maxReceive, simulate); return battery.receiveEnergy(maxReceive, simulate);
} else { } else {
return 0; return 0;