fix(world): Inverted block collisions

SerenityJS · Sep 22, 2024 · 21babbf · 21babbf
1 parent 68170ef
commit 21babbf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/packages/world/src/block/block.ts b/packages/world/src/block/block.ts
@@ -768,7 +768,7 @@ class Block {
  * @returns Wether or not the block has any existing collision
  */
  public hasCollision(): boolean {
- if (!this.isAir()) return false;
+ if (this.isAir()) return false;
  if (!this.hasComponent("minecraft:collision_box"))
  new BlockCollisionComponent(this);
  return this.getComponent("minecraft:collision_box").boxes.length > 0;

diff --git a/packages/world/src/components/block/collision-box.ts b/packages/world/src/components/block/collision-box.ts
@@ -28,7 +28,7 @@ class BlockCollisionComponent extends BlockComponent {
 
  // Initialize with a default solid collision box if the block is not air
  this.boxes = [];
- if (!block.isSolid()) this.addCollision(BlockCollisionComponent.Solid);
+ if (block.isSolid()) this.addCollision(BlockCollisionComponent.Solid);
  }
 
  /**
@@ -46,9 +46,7 @@ class BlockCollisionComponent extends BlockComponent {
  // Iterate through each collision box and check for intersections.
  for (const box of this.boxes) {
  // Move the box to the block's position and check for intersections.
- const movedBox = box.move(
- BlockPosition.toVector3f(this.block.position)
- );
+ const movedBox = box.move(BlockPosition.toVector3f(this.block.position));
  const result = AABB.Intercept(movedBox, start, end);
 
  // Continue if no intersection is found.