From f8a52dfc98fa12cc62033766373d0748e552f96d Mon Sep 17 00:00:00 2001 From: Holly Date: Wed, 12 Apr 2023 23:37:51 +0100 Subject: [PATCH] Fix chunk loading --- bufferStuff.ts | 9 +++++++++ server/WorldSaveManager.ts | 6 ++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/bufferStuff.ts b/bufferStuff.ts index 2116cf3..e67aae6 100644 --- a/bufferStuff.ts +++ b/bufferStuff.ts @@ -13,6 +13,15 @@ export class Reader { return value; } + public readUint8Array(bytes:number) { + const croppedBuffer = this.readBuffer(bytes); + const newArray = new Uint8Array(croppedBuffer.length); + for (let i = 0; i < croppedBuffer.length; i++) { + newArray[i] = croppedBuffer[i]; + } + return newArray; + } + public readByte() { const value = this.buffer.readInt8(this.offset); this.offset++; diff --git a/server/WorldSaveManager.ts b/server/WorldSaveManager.ts index 44ae6e3..2911e0b 100644 --- a/server/WorldSaveManager.ts +++ b/server/WorldSaveManager.ts @@ -96,7 +96,9 @@ export class WorldSaveManager { chunkFileWriter.writeUByte(128); // Chunk Y chunkFileWriter.writeUByte(16); // Chunk Z - const chunkData = new Writer().writeBuffer(Buffer.from(chunk.getData())).writeBuffer(chunk.getMetadataBuffer()).toBuffer(); + const chunkData = new Writer() + .writeBuffer(Buffer.from(chunk.getData())) + .writeBuffer(chunk.getMetadataBuffer()).toBuffer(); if (saveType === SaveCompressionType.NONE) { chunkFileWriter.writeInt(chunkData.length); // Data length @@ -159,7 +161,7 @@ export class WorldSaveManager { const contentLength = chunkFileReader.readInt(); if (saveCompressionType === SaveCompressionType.NONE) { const chunkData = new Reader(chunkFileReader.readBuffer(contentLength)); - const chunk = new Chunk(world, x, z, chunkData.readBuffer(totalByteSize).buffer, chunkData.readBuffer(totalByteSize / 2).buffer); + const chunk = new Chunk(world, x, z, chunkData.readUint8Array(totalByteSize), chunkData.readUint8Array(totalByteSize / 2)); resolve(chunk); } else if (saveCompressionType === SaveCompressionType.DEFLATE) { inflate(chunkFileReader.readBuffer(contentLength), (err, data) => {