From df7b082c2563cf30bbb5c5478426a5b1ead88202 Mon Sep 17 00:00:00 2001 From: Adrian Siekierka Date: Mon, 10 Nov 2014 18:14:00 +0100 Subject: [PATCH] fix #2179, fix #2185 --- common/buildcraft/builders/TileBuilder.java | 4 ++++ common/buildcraft/transport/pipes/PipePowerWood.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/common/buildcraft/builders/TileBuilder.java b/common/buildcraft/builders/TileBuilder.java index d93b5fdf..2012df86 100644 --- a/common/buildcraft/builders/TileBuilder.java +++ b/common/buildcraft/builders/TileBuilder.java @@ -311,6 +311,10 @@ public class TileBuilder extends TileAbstractBuilder implements IHasWork, IFluid @Deprecated public BptBuilderBase instanciateBluePrintBuilder(int x, int y, int z, ForgeDirection o) { BlueprintBase bpt = instanciateBlueprint(); + if (bpt == null) { + return null; + } + bpt = bpt.adjustToWorld(worldObj, x, y, z, o); if (getStackInSlot(0).getItem() instanceof ItemBlueprintStandard) { diff --git a/common/buildcraft/transport/pipes/PipePowerWood.java b/common/buildcraft/transport/pipes/PipePowerWood.java index 223d4209..d407a87e 100644 --- a/common/buildcraft/transport/pipes/PipePowerWood.java +++ b/common/buildcraft/transport/pipes/PipePowerWood.java @@ -222,7 +222,7 @@ public class PipePowerWood extends Pipe implements IPowerRec @Override public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) { - if (powerSources[from.ordinal()]) { + if (from.ordinal() < 6 && powerSources[from.ordinal()]) { return battery.receiveEnergy(maxReceive, simulate); } else { return 0;