Implement minY and maxY for collision shapes

AlexProgrammerDE · Dec 2, 2024 · abbd6ae · abbd6ae
1 parent eaedc2f
commit abbd6ae
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/server/src/main/java/com/soulfiremc/server/data/BlockShapeGroup.java b/server/src/main/java/com/soulfiremc/server/data/BlockShapeGroup.java
@@ -28,7 +28,7 @@
 import java.util.List;
 
 @SuppressWarnings("unused")
-public record BlockShapeGroup(int id, List<AABB> blockShapes, double highestY, List<Direction> fullFaceDirections) {
+public record BlockShapeGroup(int id, List<AABB> blockShapes, double minY, double maxY, List<Direction> fullFaceDirections) {
   public static final Int2ObjectMap<BlockShapeGroup> FROM_ID = new Int2ObjectOpenHashMap<>();
   public static final BlockShapeGroup EMPTY;
 
@@ -73,6 +73,7 @@ public record BlockShapeGroup(int id, List<AABB> blockShapes, double highestY, L
             new BlockShapeGroup(
               id,
               blockShapes,
+              blockShapes.stream().mapToDouble(a -> a.minY).min().orElse(0),
               blockShapes.stream().mapToDouble(a -> a.maxY).max().orElse(0),
               fullFaceDirections));
         });

diff --git a/server/src/main/java/com/soulfiremc/server/util/VectorHelper.java b/server/src/main/java/com/soulfiremc/server/util/VectorHelper.java
@@ -40,7 +40,7 @@ public static Vector3d topMiddleOfBlock(Vector3d vector, BlockState blockState)
   }
 
   public static Vector3d topMiddleOfBlock(Vector3d vector, BlockShapeGroup blockShapeGroup) {
-    return vector.floor().add(0.5, blockShapeGroup.highestY(), 0.5);
+    return vector.floor().add(0.5, blockShapeGroup.maxY(), 0.5);
   }
 
   public static Vector3d xRot(Vector3d base, float pitch) {