From 7e46c941bf1259a069f52528d2558c027d3bb487 Mon Sep 17 00:00:00 2001 From: David Vierra Date: Sat, 25 Sep 2010 21:51:29 -1000 Subject: [PATCH] copyWater can now be turned off without turning off copyAir --- mclevel.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/mclevel.py b/mclevel.py index 888e636..54c40c4 100644 --- a/mclevel.py +++ b/mclevel.py @@ -806,12 +806,13 @@ class MCLevel: def copyBlockArrayMasked(self, blocks, sourceBlocks, copyAir, copyWater): #assumes sourceBlocks has already been converted to my materials + mask = sourceBlocks == sourceBlocks if not copyAir: - mask=(sourceBlocks!=0) - if not copyWater: - mask &=(sourceBlocks != self.materials.materialNamed("Water")) - mask &=(sourceBlocks != self.materials.materialNamed("Stationary water")) - + mask &=(sourceBlocks != self.materials.materialNamed("Air")) + if not copyWater: + mask &=(sourceBlocks != self.materials.materialNamed("Water")) + mask &=(sourceBlocks != self.materials.materialNamed("Stationary water")) + blocks[mask] = sourceBlocks[mask] return mask;