Merge branch '6.1.x' of github.com:BuildCraft/BuildCraft into 6.1.x

This commit is contained in:
SpaceToad 2014-08-03 11:38:53 +02:00
commit 8a0222a2ff

View file

@ -85,7 +85,7 @@ public class TileConstructionMarker extends TileBuildCraft implements IBuildingI
return;
}
if (itemBlueprint != null && bluePrintBuilder == null) {
if (itemBlueprint != null && ItemBlueprint.getId(itemBlueprint) != null && bluePrintBuilder == null) {
bluePrintBuilder = new BptBuilderBlueprint((Blueprint) ItemBlueprint.loadBlueprint(itemBlueprint),
worldObj, xCoord, yCoord, zCoord);
bptContext = bluePrintBuilder.getContext();