Prismarine: Fix #1328.

JSPrismarine · Apr 17, 2024 · 2b5bc2f · 2b5bc2f
1 parent 1394138
commit 2b5bc2f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/.changeset/dull-cheetahs-applaud.md b/.changeset/dull-cheetahs-applaud.md
@@ -0,0 +1,5 @@
+---
+"@jsprismarine/prismarine": patch
+---
+
+Fix "Blocks in negative coordinates don't behave correctly." [#1328](https://github.com/JSPrismarine/JSPrismarine/issues/1328).
diff --git a/packages/prismarine/src/world/chunk/BlockStorage.ts b/packages/prismarine/src/world/chunk/BlockStorage.ts
@@ -1,5 +1,5 @@
-import { BlockMappings } from '../../block/BlockMappings';
 import type { LegacyId } from '../../block/BlockMappings';
+import { BlockMappings } from '../../block/BlockMappings';
 
 import type BinaryStream from '@jsprismarine/jsbinaryutils';
 
@@ -18,9 +18,9 @@ export default class BlockStorage {
     }
 
     private static getIndex(bx: number, by: number, bz: number): number {
-        // bx &= 0x0f;
-        // by &= 0x0f;
-        // bz &= 0x0f;
+        bx = bx & 0x0f;
+        bz = bz & 0x0f;
+        by = by & 0x0f;
         return ((bx << 8) + (bz << 4)) | by;
     }
 

diff --git a/packages/prismarine/src/world/chunk/Chunk.ts b/packages/prismarine/src/world/chunk/Chunk.ts
@@ -92,7 +92,7 @@ export default class Chunk {
             return this.getBlock(bx.getX(), bx.getY(), bx.getZ(), layer);
         }
 
-        const subChunk = this.getSubChunk(by >> 4);
+        const subChunk = this.getSubChunk(Math.floor(by / 16));
         if (subChunk === null) {
             return BlockMappings.getLegacyId(BlockMappings.getRuntimeId('minecraft:air'));
         }
@@ -109,7 +109,7 @@ export default class Chunk {
      * @param layer - block storage layer (0 for blocks, 1 for liquids)
      */
     public setBlock(bx: number, by: number, bz: number, block: Block, layer = 0): void {
-        let subChunk = this.getSubChunk(by >> 4);
+        let subChunk = this.getSubChunk(Math.floor(by / 16));
         if (subChunk === null) {
             if (block.getName() === 'minecraft:air') {
                 return;