From f7bed060030cc2c7c0d74c6cb3d3f664b3fa1748 Mon Sep 17 00:00:00 2001 From: David Vierra Date: Sat, 5 Sep 2015 10:40:46 -1000 Subject: [PATCH] Minor rename and refactor in copyBlocksIter --- src/mceditlib/block_copy.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/mceditlib/block_copy.py b/src/mceditlib/block_copy.py index e48f132..90c4a48 100644 --- a/src/mceditlib/block_copy.py +++ b/src/mceditlib/block_copy.py @@ -146,23 +146,24 @@ def copyBlocksIter(destDim, sourceDim, sourceSelection, destinationPoint, blocks # Read blocks sourceBlocks = sourceSection.Blocks[sourceSlices] sourceData = sourceSection.Data[sourceSlices] - sourceMaskPart = sourceMask[sourceSlices] + sourceMaskSliced = sourceMask[sourceSlices] # Convert blocks convertedSourceBlocks, convertedSourceData = convertBlocks(sourceBlocks, sourceData) - convertedSourceBlocksMasked = convertedSourceBlocks[sourceMaskPart] + convertedSourceBlocksMasked = convertedSourceBlocks[sourceMaskSliced] + convertedSourceDataMasked = convertedSourceData[sourceMaskSliced] # Find blocks that need direct lighting update - block opacity or brightness changed - oldBrightness = destDim.blocktypes.brightness[destSection.Blocks[destSlices][sourceMaskPart]] + oldBrightness = destDim.blocktypes.brightness[destSection.Blocks[destSlices][sourceMaskSliced]] newBrightness = destDim.blocktypes.brightness[convertedSourceBlocksMasked] - oldOpacity = destDim.blocktypes.opacity[destSection.Blocks[destSlices][sourceMaskPart]] + oldOpacity = destDim.blocktypes.opacity[destSection.Blocks[destSlices][sourceMaskSliced]] newOpacity = destDim.blocktypes.opacity[convertedSourceBlocksMasked] changedLight = (oldBrightness != newBrightness) | (oldOpacity != newOpacity) # Write blocks - destSection.Blocks[destSlices][sourceMaskPart] = convertedSourceBlocks[sourceMaskPart] - destSection.Data[destSlices][sourceMaskPart] = convertedSourceData[sourceMaskPart] + destSection.Blocks[destSlices][sourceMaskSliced] = convertedSourceBlocksMasked + destSection.Data[destSlices][sourceMaskSliced] = convertedSourceDataMasked if updateLights: # Find coordinates of lighting updates