Merge branch 'facades-5.0.x' of https://github.com/Prototik/BuildCraft into Prototik-facades-5.0.x

This commit is contained in:
SpaceToad 2014-05-10 07:59:09 +02:00
commit fba31fa057

View file

@ -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 + "]");