From 791003e72c6724e4594e2fcffe5562fe12d157ad Mon Sep 17 00:00:00 2001 From: David Vierra Date: Wed, 6 Oct 2010 17:48:09 -1000 Subject: [PATCH] messed with the indentation... --- mclevel.py | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/mclevel.py b/mclevel.py index 0a45b4c..2056436 100644 --- a/mclevel.py +++ b/mclevel.py @@ -2336,28 +2336,28 @@ class MCInfdevOldLevel(MCLevel): filterTable = sourceLevel.materials.conversionTables[self.materials] copyOffset = map(lambda x,y:x-y, destinationPoint, sourceBox.origin) for s in itertools.product(*map(lambda x:range(*x), zip(sourceBox.origin, sourceBox.size))): - destX, destZ, destY = copyOffset[0]+s[0], copyOffset[2]+s[2], copyOffset[1]+s[1] - - destChunkX,destChunkZ = destX>>4,destZ>>4 - destBlockX = destX & 0xf - destBlockZ = destZ & 0xf - - try: - chunk = self.getChunk( destChunkX,destChunkZ ) - blocks=chunk.Blocks - - blockType = sourceLevel.blockAt(*s) - blockType = filterTable[blockType] - if not (blocksToCopy is None) and not (blockType in blocksToCopy): continue - - blocks[destBlockX,destBlockZ,destY] = blockType - self.setBlockDataAt(destX, destY, destZ, sourceLevel.blockDataAt(*s)) - - except ChunkNotPresent, e: - continue; - else: - chunk.chunkChanged(); - blocksCopied += 1; + destX, destZ, destY = copyOffset[0]+s[0], copyOffset[2]+s[2], copyOffset[1]+s[1] + + destChunkX,destChunkZ = destX>>4,destZ>>4 + destBlockX = destX & 0xf + destBlockZ = destZ & 0xf + + try: + chunk = self.getChunk( destChunkX,destChunkZ ) + blocks=chunk.Blocks + + blockType = sourceLevel.blockAt(*s) + blockType = filterTable[blockType] + if not (blocksToCopy is None) and not (blockType in blocksToCopy): continue + + blocks[destBlockX,destBlockZ,destY] = blockType + self.setBlockDataAt(destX, destY, destZ, sourceLevel.blockDataAt(*s)) + + except ChunkNotPresent, e: + continue; + else: + chunk.chunkChanged(); + blocksCopied += 1; self.copyEntitiesFrom(sourceLevel, sourceBox, destinationPoint) info( "Blocks copied: %d" % blocksCopied )