fixed loading of destroying builders blocks, fix #1623

BuildCraft · Apr 26, 2014 · 69c8d75 · 69c8d75
1 parent 5a80007
commit 69c8d75
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/common/buildcraft/api/blueprints/SchematicFactoryBlock.java b/common/buildcraft/api/blueprints/SchematicFactoryBlock.java
@@ -8,22 +8,33 @@
  */
 package buildcraft.api.blueprints;
 
+import net.minecraft.block.Block;
+import net.minecraft.init.Blocks;
 import net.minecraft.nbt.NBTTagCompound;
 
 public class SchematicFactoryBlock extends SchematicFactory <SchematicBlock> {
 
 	@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
@@ -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();