GeyserMC-Mirror/Geyser
1
0
Fork 0
mirror of https://github.com/GeyserMC/Geyser.git synced 2026-01-06 15:41:50 +00:00
Code Issues Releases Activity

Fix: remove collision expansion when correcting player position (#5798)

Browse Source
This commit is contained in:
oryxel
2025-09-04 07:00:14 +07:00
committed by GitHub
parent 9e22144ab5
commit 9cc4e9c7ea
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/main/java/org/geysermc/geyser/translator/collision/BlockCollision.java
View File

@@ -53,11 +53,6 @@ public class BlockCollision {
* Silently move player bounding box/position out of block when needed to.
*/
public void correctPosition(GeyserSession session, int x, int y, int z, BoundingBox playerCollision) {
final double collisionExpansion = CollisionManager.COLLISION_TOLERANCE * 2;
// Make player collision slightly bigger to pick up on blocks that could cause problems with Passable
// TODO: Is this still needed? This should be removed if it's not needed anymore.
playerCollision.expand(collisionExpansion);
// Due to floating points errors, or possibly how collision is handled on Bedrock, player could be slightly clipping into the block.
// So we check if the player is intersecting the block, if they do then push them out. This fixes NoCheatPlus's Passable check and other anticheat checks.
// This check doesn't allow players right up against the block, so they must be pushed slightly away. However, we should only do it if the
@@ -82,9 +77,6 @@ public class BlockCollision {
boundingBox.pushOutOfBoundingBox(playerCollision, Direction.UP, pushAwayTolerance);
boundingBox.pushOutOfBoundingBox(playerCollision, Direction.DOWN, pushAwayTolerance);
}
// Set the collision size back to normal
playerCollision.expand(-collisionExpansion);
}
public boolean checkIntersection(double x, double y, double z, BoundingBox playerCollision) {