diff --git a/common/buildcraft/api/blueprints/SchematicFactoryBlock.java b/common/buildcraft/api/blueprints/SchematicFactoryBlock.java index eab4173e23..28ee77c4d4 100755 --- a/common/buildcraft/api/blueprints/SchematicFactoryBlock.java +++ b/common/buildcraft/api/blueprints/SchematicFactoryBlock.java @@ -8,6 +8,8 @@ */ package buildcraft.api.blueprints; +import net.minecraft.block.Block; +import net.minecraft.init.Blocks; import net.minecraft.nbt.NBTTagCompound; public class SchematicFactoryBlock extends SchematicFactory { @@ -15,15 +17,24 @@ public class SchematicFactoryBlock extends SchematicFactory { @Override protected SchematicBlock loadSchematicFromWorldNBT (NBTTagCompound nbt, MappingRegistry registry) { int blockId = nbt.getInteger("blockId"); - SchematicBlock s = SchematicRegistry.newSchematicBlock(registry.getBlockForId(blockId)); + Block b = registry.getBlockForId(blockId); - if (s != null) { - s.readFromNBT(nbt, registry); + if (b == Blocks.air) { + SchematicBlock s = new SchematicBlock(); + s.meta = 0; + s.block = Blocks.air; + + return s; } else { - return null; + SchematicBlock s = SchematicRegistry.newSchematicBlock(b); + + if (s != null) { + s.readFromNBT(nbt, registry); + return s; + } } - return s; + return null; } @Override diff --git a/common/buildcraft/builders/BuildingItem.java b/common/buildcraft/builders/BuildingItem.java index 46090af7dd..efb06e1d2c 100755 --- a/common/buildcraft/builders/BuildingItem.java +++ b/common/buildcraft/builders/BuildingItem.java @@ -228,7 +228,7 @@ public void writeToNBT (NBTTagCompound nbt) { destination.writeToNBT(destinationNBT); nbt.setTag ("destination", destinationNBT); - nbt.setDouble("lifeTime", lifetime); + nbt.setDouble("lifetime", lifetime); NBTTagList items = new NBTTagList();