fix #3071

buildcraft_resources/changelog/7.1.10

@@ -1,5 +1,7 @@
 Bugs fixed:
 
 * [#3072] PipeTransportFluids crash (proper fix) (asie)
+* [#3071] Filled cylinder pattern incorrect (asie)
 * [#3069, #2865] Fluid pipe extraction speed ~25% lower than intended (asie, mconwa01)
+* Filler not changing pattern on parameter change (asie)
 * Rotated quarry not detecting its own frame (asie)

common/buildcraft/builders/TileFiller.java

@@ -368,6 +368,7 @@ public class TileFiller extends TileAbstractBuilder implements IHasWork, IContro
 				NBTTagCompound patternData = NetworkUtils.readNBT(stream);
 				readParametersFromNBT(patternData);
 
+				currentTemplate = null;
 				done = false;
 			} else if ("setFlags".equals(command)) {
 				excavate = stream.readBoolean();

common/buildcraft/core/builders/patterns/PatternCylinder.java

@@ -61,6 +61,7 @@ public class PatternCylinder extends FillerPattern {
 
 		if (xRadius == 0 || zRadius == 0) {
 			fill(xMin, yMin, zMin, xMax, yMax, zMax, result);
+			return result;
 		}
 
 		int dx = xRadius, dz = 0;
@@ -105,8 +106,13 @@ public class PatternCylinder extends FillerPattern {
 
 		if (twoBSquare > 0) {
 			while (stoppingX <= stoppingZ) {
-				fillFourColumns(xCenter, zCenter, dx, dz, xFix, zFix, yMin,
-						yMax, result);
+				if (filled) {
+					fillSquare(xCenter, zCenter, dx, dz, xFix, zFix, yMin,
+							yMax, result);
+				} else {
+					fillFourColumns(xCenter, zCenter, dx, dz, xFix, zFix, yMin,
+							yMax, result);
+				}
 
 				++dx;
 				stoppingX += twoBSquare;