0x38: remove chunkColumnCount. Use meta.length

This commit is contained in:
Andrew Kelley 2013-01-05 18:44:00 -05:00
parent ab54392f46
commit a50bf7926b

View file

@ -623,11 +623,11 @@ function readObjectData(buffer, offset) {
function readMapChunkBulk (buffer, offset) { function readMapChunkBulk (buffer, offset) {
var cursor = offset + 7; var cursor = offset + 7;
if (cursor > buffer.length) return null; if (cursor > buffer.length) return null;
var chunkCount = buffer.readInt16BE(offset); var chunkColumnCount = buffer.readInt16BE(offset);
var dataSize = buffer.readInt32BE(offset + 2); var dataSize = buffer.readInt32BE(offset + 2);
var skyLightSent = !!buffer.readInt8(offset + 6); var skyLightSent = !!buffer.readInt8(offset + 6);
var cursorEnd = cursor + dataSize + 12 * chunkCount; var cursorEnd = cursor + dataSize + 12 * chunkColumnCount;
if (cursorEnd > buffer.length) return null; if (cursorEnd > buffer.length) return null;
var compressedChunkDataEnd = cursor + dataSize; var compressedChunkDataEnd = cursor + dataSize;
@ -636,7 +636,7 @@ function readMapChunkBulk (buffer, offset) {
var meta = []; var meta = [];
var i, chunkX, chunkZ, bitMap, addBitMap; var i, chunkX, chunkZ, bitMap, addBitMap;
for (i = 0; i < chunkCount; ++i) { for (i = 0; i < chunkColumnCount; ++i) {
chunkX = buffer.readInt32BE(cursor); chunkX = buffer.readInt32BE(cursor);
cursor += 4; cursor += 4;
chunkZ = buffer.readInt32BE(cursor); chunkZ = buffer.readInt32BE(cursor);
@ -654,10 +654,11 @@ function readMapChunkBulk (buffer, offset) {
}); });
} }
assert.strictEqual(chunkColumnCount, meta.length);
return { return {
value: { value: {
skyLightSent: skyLightSent, skyLightSent: skyLightSent,
chunkCount: chunkCount,
compressedChunkData: compressedChunkData, compressedChunkData: compressedChunkData,
meta: meta, meta: meta,
}, },