I missed a Shapes.or

Fusion-Flux · Jul 21, 2023 · e98e24f · e98e24f
1 parent 0446159
commit e98e24f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/src/main/java/com/fusionflux/portalcubed/entity/Portal.java b/src/main/java/com/fusionflux/portalcubed/entity/Portal.java
@@ -596,7 +596,7 @@ private VoxelShape calculateCrossPortalCollisionShape(Vec3 normal, Vec3 origin,
         final VoxelShape clippingShape = Shapes.create(clipping);
         VoxelShape result = Shapes.empty();
         for (final VoxelShape shape : level().getBlockCollisions(context, clipping)) {
-            result = Shapes.or(result, Shapes.joinUnoptimized(shape, clippingShape, BooleanOp.AND));
+            result = Shapes.joinUnoptimized(result, Shapes.joinUnoptimized(shape, clippingShape, BooleanOp.AND), BooleanOp.OR);
         }
         if (otherRotation != null && !result.isEmpty() /* Empty shapes don't need to be translated */) {
             final Vec3 scaledNormalOffset = getNormal().scale(SURFACE_OFFSET);

diff --git a/src/main/java/com/fusionflux/portalcubed/mixin/EntityMixin.java b/src/main/java/com/fusionflux/portalcubed/mixin/EntityMixin.java
@@ -121,9 +121,6 @@ public void setMaxFallSpeed(double maxFallSpeed) {
     @Shadow
     public abstract boolean equals(Object o);
 
-    @Shadow
-    public abstract boolean isNoGravity();
-
     @Shadow
     public abstract boolean onGround();