Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix searching for main supporting block #1709

Merged
merged 2 commits into from
Sep 11, 2024
Merged

fix searching for main supporting block #1709

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4cb19c
fix searching for main supporting block
Cyramek Sep 11, 2024
95955b8
typo
Cyramek Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
typo
  • Loading branch information
@Cyramek
Cyramek committed Sep 11, 2024
commit 95955b81f6a61deded7374ec28fd15d809e48827
2 changes: 1 addition & 1 deletion src/main/java/ac/grim/grimac/utils/nmsutil/Collisions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -712,7 +712,7 @@ public static boolean hasMaterial(GrimPlayer player, SimpleCollisionBox checkBox
}

// Thanks Tuinity
public static void forEachCollisionBoxes(GrimPlayer player, SimpleCollisionBox checkBox, Consumer<Vector3d> searchingFor) {
public static void forEachCollisionBox(GrimPlayer player, SimpleCollisionBox checkBox, Consumer<Vector3d> searchingFor) {
int minBlockX = (int) Math.floor(checkBox.minX - COLLISION_EPSILON) - 1;
int maxBlockX = (int) Math.floor(checkBox.maxX + COLLISION_EPSILON) + 1;
int minBlockY = (int) Math.floor(checkBox.minY - COLLISION_EPSILON) - 1;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/ac/grim/grimac/utils/nmsutil/MainSupportingBlockPosFinder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ private Optional<Vector3i> findSupportingBlock(GrimPlayer player, SimpleCollisio
AtomicReference<Vector3i> bestBlockPos = new AtomicReference<>();
AtomicDouble blockPosDistance = new AtomicDouble(Double.MAX_VALUE);

Collisions.forEachCollisionBoxes(player, searchBox, (pos) -> {
Collisions.forEachCollisionBox(player, searchBox, (pos) -> {
Vector3i blockPos = pos.toVector3i();
Vector3d blockPosAsVector3d = new Vector3d(blockPos.getX() + 0.5, blockPos.getY() + 0.5, blockPos.getZ() + 0.5);
double distance = playerPos.distanceSquared(blockPosAsVector3d);
Expand Down