From 30a79469e3d16474a276d5e17cf09edadf9befeb Mon Sep 17 00:00:00 2001 From: Spottedleaf Date: Mon, 27 Jan 2025 07:51:49 -0800 Subject: [PATCH] Correctly retrun true for empty input shapes in EntityGetter#isUnobstructed Vanilla will return true for empty shapes, so we should as well. --- .../moonrise/mixin/collisions/EntityGetterMixin.java | 2 +- .../ca/spottedleaf/moonrise/mixin/collisions/LevelMixin.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/ca/spottedleaf/moonrise/mixin/collisions/EntityGetterMixin.java b/src/main/java/ca/spottedleaf/moonrise/mixin/collisions/EntityGetterMixin.java index c084f41..8d8478b 100644 --- a/src/main/java/ca/spottedleaf/moonrise/mixin/collisions/EntityGetterMixin.java +++ b/src/main/java/ca/spottedleaf/moonrise/mixin/collisions/EntityGetterMixin.java @@ -74,7 +74,7 @@ interface EntityGetterMixin { @Overwrite default boolean isUnobstructed(final Entity entity, final VoxelShape voxel) { if (voxel.isEmpty()) { - return false; + return true; } final AABB singleAABB = ((CollisionVoxelShape)voxel).moonrise$getSingleAABBRepresentation(); diff --git a/src/main/java/ca/spottedleaf/moonrise/mixin/collisions/LevelMixin.java b/src/main/java/ca/spottedleaf/moonrise/mixin/collisions/LevelMixin.java index 845dca8..24fab2a 100644 --- a/src/main/java/ca/spottedleaf/moonrise/mixin/collisions/LevelMixin.java +++ b/src/main/java/ca/spottedleaf/moonrise/mixin/collisions/LevelMixin.java @@ -55,7 +55,7 @@ abstract class LevelMixin implements LevelAccessor, AutoCloseable { public boolean isUnobstructed(final Entity entity) { final AABB boundingBox = entity.getBoundingBox(); if (CollisionUtil.isEmpty(boundingBox)) { - return false; + return true; } final List entities = this.getEntities(