increased amount of energy storable in builders and fixed infinite loop

BuildCraft · Apr 27, 2014 · e0f0e1d · e0f0e1d
1 parent 9b77c7d
commit e0f0e1d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/common/buildcraft/builders/TileAbstractBuilder.java b/common/buildcraft/builders/TileAbstractBuilder.java
@@ -30,7 +30,7 @@ public abstract class TileAbstractBuilder extends TileBuildCraft implements ITil
 	public static double BREAK_ENERGY = 10;
 	public static double BUILD_ENERGY = 20;
 
-	@MjBattery(maxReceivedPerCycle = 100, maxCapacity = 1000, minimumConsumption = 1)
+	@MjBattery(maxReceivedPerCycle = 100, maxCapacity = 10000, minimumConsumption = 1)
 	protected double mjStored = 0;
 
 	@NetworkData

diff --git a/common/buildcraft/core/blueprints/BptBuilderBlueprint.java b/common/buildcraft/core/blueprints/BptBuilderBlueprint.java
@@ -237,15 +237,19 @@ private BuildingSlot internalGetNextBlock(World world, TileAbstractBuilder build
 						}
 					}
 				} else {
-					if (BuildCraftAPI.isSoftBlock(world, slot.x, slot.y, slot.z)
-							&& checkRequirements(builder,
-									slot.schematic)) {
-						useRequirements(builder, slot);
+					if (BuildCraftAPI.isSoftBlock(world, slot.x, slot.y, slot.z)) {
+						if (checkRequirements(builder, slot.schematic)) {
+							useRequirements(builder, slot);
 
-						iterator.remove();
-						postProcessing.add(slot);
-						builtLocations.add(new BlockIndex(slot.x, slot.y, slot.z));
-						return slot;
+							iterator.remove();
+							postProcessing.add(slot);
+							builtLocations.add(new BlockIndex(slot.x, slot.y, slot.z));
+							return slot;
+						} else {
+							// the block is not soft anymore, we can't build here.
+							// forget about it.
+							iterator.remove();
+						}
 					}
 				}
 			} else {