diff --git a/common/buildcraft/transport/TileGenericPipe.java b/common/buildcraft/transport/TileGenericPipe.java index 841fb0d8..ccf51bea 100644 --- a/common/buildcraft/transport/TileGenericPipe.java +++ b/common/buildcraft/transport/TileGenericPipe.java @@ -176,8 +176,18 @@ public class TileGenericPipe extends TileEntity implements IFluidHandler, facadeBlocks[i][1] = null; } - facadeMeta[i][0] = nbt.getInteger("facadeMeta[" + i + "][0]"); - facadeMeta[i][1] = nbt.getInteger("facadeMeta[" + i + "][1]"); + if (nbt.hasKey("facadeBlocks[" + i + "]")) { + facadeBlocks[i][0] = (Block) Block.blockRegistry.getObjectById(nbt.getInteger("facadeBlocks[" + i + "]")); + facadeBlocks[i][1] = null; + } + + if (nbt.hasKey("facadeMeta[" + i + "]")) { + facadeMeta[i][0] = nbt.getInteger("facadeMeta[" + i + "]"); + facadeMeta[i][1] = 0; + } else { + facadeMeta[i][0] = nbt.getInteger("facadeMeta[" + i + "][0]"); + facadeMeta[i][1] = nbt.getInteger("facadeMeta[" + i + "][1]"); + } plugs[i] = nbt.getBoolean("plug[" + i + "]"); robotStations[i] = nbt.getBoolean("robotStation[" + i + "]");