AstralTransRocketries/pymclevel
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

messed with the indentation...

Browse Source
This commit is contained in:
David Vierra 2010-10-06 17:48:09 -10:00
parent 31b4fcbf13
commit 791003e72c
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
mclevel.py
View File

@ -2336,28 +2336,28 @@ class MCInfdevOldLevel(MCLevel):
filterTable = sourceLevel.materials.conversionTables[self.materials] filterTable = sourceLevel.materials.conversionTables[self.materials]
copyOffset = map(lambda x,y:x-y, destinationPoint, sourceBox.origin) 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))): 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] destX, destZ, destY = copyOffset[0]+s[0], copyOffset[2]+s[2], copyOffset[1]+s[1]
destChunkX,destChunkZ = destX>>4,destZ>>4 destChunkX,destChunkZ = destX>>4,destZ>>4
destBlockX = destX & 0xf destBlockX = destX & 0xf
destBlockZ = destZ & 0xf destBlockZ = destZ & 0xf
try: try:
chunk = self.getChunk( destChunkX,destChunkZ ) chunk = self.getChunk( destChunkX,destChunkZ )
blocks=chunk.Blocks blocks=chunk.Blocks
blockType = sourceLevel.blockAt(*s) blockType = sourceLevel.blockAt(*s)
blockType = filterTable[blockType] blockType = filterTable[blockType]
if not (blocksToCopy is None) and not (blockType in blocksToCopy): continue if not (blocksToCopy is None) and not (blockType in blocksToCopy): continue
blocks[destBlockX,destBlockZ,destY] = blockType blocks[destBlockX,destBlockZ,destY] = blockType
self.setBlockDataAt(destX, destY, destZ, sourceLevel.blockDataAt(*s)) self.setBlockDataAt(destX, destY, destZ, sourceLevel.blockDataAt(*s))
except ChunkNotPresent, e: except ChunkNotPresent, e:
continue; continue;
else: else:
chunk.chunkChanged(); chunk.chunkChanged();
blocksCopied += 1; blocksCopied += 1;
self.copyEntitiesFrom(sourceLevel, sourceBox, destinationPoint) self.copyEntitiesFrom(sourceLevel, sourceBox, destinationPoint)
info( "Blocks copied: %d" % blocksCopied ) info( "Blocks copied: %d" % blocksCopied )