GeyserMC/Geyser
GeyserMC/Geyser
4
4
Fork 3
mirror of https://github.com/GeyserMC/Geyser.git synced 2024-08-14 23:57:35 +00:00
Code Issues 103 Projects Releases Wiki Activity

Consider all hitboxes in calculation

Browse source 
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
This commit is contained in:
Joshua Castle 2023-03-13 21:05:31 -07:00
parent 7f85e909b8
commit b36ccbef19
No known key found for this signature in database
GPG key ID: F674F38216C35D5D
1 changed files with 32 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
core/src/main/java/org/geysermc/geyser/registry/mappings/versions/MappingsReader_v1.java
View file

@ -414,33 +414,49 @@ public class MappingsReader_v1 extends MappingsReader {
/** /**
* Creates a {@link BoxComponent} based on a Java block's collision with provided bounds and offsets * Creates a {@link BoxComponent} based on a Java block's collision with provided bounds and offsets
* @param javaId the block's Java ID * @param javaId the block's Java ID
* @param minHeight the minimum height of the box
* @param maxHeight the maximum height of the box
* @param heightTranslation the height translation of the box * @param heightTranslation the height translation of the box
* @return the {@link BoxComponent} * @return the {@link BoxComponent}
*/ */
private BoxComponent createBoxComponent(int javaId, float minHeight, float maxHeight, float heightTranslation) { private BoxComponent createBoxComponent(int javaId, float heightTranslation) {
// Some blocks (e.g. plants) have no collision box // Some blocks (e.g. plants) have no collision box
BlockCollision blockCollision = BlockUtils.getCollision(javaId); BlockCollision blockCollision = BlockUtils.getCollision(javaId);
if (blockCollision == null) { if (blockCollision == null) {
return BoxComponent.EMPTY_BOX; return BoxComponent.EMPTY_BOX;
} }
BoundingBox boundingBox = blockCollision.getBoundingBoxes()[0]; Set<Float> bottomCornerXs = new ObjectOpenHashSet<>();
Set<Float> bottomCornerYs = new ObjectOpenHashSet<>();
Set<Float> bottomCornerZs = new ObjectOpenHashSet<>();
Set<Float> topCornerXs = new ObjectOpenHashSet<>();
Set<Float> topCornerYs = new ObjectOpenHashSet<>();
Set<Float> topCornerZs = new ObjectOpenHashSet<>();
for (BoundingBox boundingBox : blockCollision.getBoundingBoxes()) {
float offsetX = (float) boundingBox.getSizeX() * 8;
float offsetY = (float) boundingBox.getSizeY() * 8;
float offsetZ = (float) boundingBox.getSizeZ() * 8;
float offsetX = (float) boundingBox.getSizeX() * 8; float bottomCornerX = (float) boundingBox.getMiddleX() * 16 - 8 - offsetX;
float offsetY = (float) boundingBox.getSizeY() * 8; float bottomCornerY = (float) boundingBox.getMiddleY() * 16 - offsetY;
float offsetZ = (float) boundingBox.getSizeZ() * 8; float bottomCornerZ = (float) boundingBox.getMiddleZ() * 16 - 8 - offsetZ;
float cornerX = MathUtils.clamp((float) boundingBox.getMiddleX() * 16 - 8 - offsetX, -8, 8); bottomCornerXs.add(bottomCornerX);
float cornerY = MathUtils.clamp((float) boundingBox.getMiddleY() * 16 - offsetY, minHeight, maxHeight); bottomCornerYs.add(bottomCornerY);
float cornerZ = MathUtils.clamp((float) boundingBox.getMiddleZ() * 16 - 8 - offsetZ, -8, 8); bottomCornerZs.add(bottomCornerZ);
float sizeX = MathUtils.clamp((float) boundingBox.getSizeX() * 16, 0, 16); topCornerXs.add((float) boundingBox.getSizeX() * 16 + bottomCornerX);
float sizeY = MathUtils.clamp((float) boundingBox.getSizeY() * 16, minHeight, maxHeight); topCornerYs.add((float) boundingBox.getSizeY() * 16 + bottomCornerY);
float sizeZ = MathUtils.clamp((float) boundingBox.getSizeZ() * 16, 0, 16); topCornerZs.add((float) boundingBox.getSizeZ() * 16 + bottomCornerZ);
}
return new BoxComponent(cornerX, cornerY + heightTranslation, cornerZ, sizeX, sizeY + heightTranslation, sizeZ); float cornerX = MathUtils.clamp(Collections.min(bottomCornerXs), -8, 8);
float cornerY = MathUtils.clamp(Collections.min(bottomCornerYs) + heightTranslation, 0, 16);
float cornerZ = MathUtils.clamp(Collections.min(bottomCornerZs), -8, 8);
float sizeX = MathUtils.clamp(Collections.max(topCornerXs) - cornerX, 0, 16);
float sizeY = MathUtils.clamp(Collections.max(topCornerYs) - cornerY + heightTranslation, 0, 16);
float sizeZ = MathUtils.clamp(Collections.max(topCornerZs) - cornerZ, 0 ,16);
return new BoxComponent(cornerX, cornerY, cornerZ, sizeX, sizeY, sizeZ);
} }
/** /**
@ -449,7 +465,7 @@ public class MappingsReader_v1 extends MappingsReader {
* @return the {@link BoxComponent} * @return the {@link BoxComponent}
*/ */
private BoxComponent createBoxComponent(int javaId) { private BoxComponent createBoxComponent(int javaId) {
return createBoxComponent(javaId, 0, 16, 0); return createBoxComponent(javaId, 0);
} }
/** /**
@ -467,7 +483,7 @@ public class MappingsReader_v1 extends MappingsReader {
float cornerY = (float) boundingBox.getMiddleY() * 16 - offsetY; float cornerY = (float) boundingBox.getMiddleY() * 16 - offsetY;
float sizeY = (float) boundingBox.getSizeY() * 16; float sizeY = (float) boundingBox.getSizeY() * 16;
if (cornerY > 16 || sizeY > 16) { if (cornerY > 16 || sizeY > 16) {
return createBoxComponent(javaId, 16, 32, -16); return createBoxComponent(javaId, -16);
} }
return null; return null;
} }