Upstream/Minestom
1
0
Fork 0
mirror of https://github.com/Minestom/Minestom.git synced 2025-02-14 19:32:17 +01:00
Code Issues Projects Releases Wiki Activity

fix entity collisions (#2348)

Browse Source
This commit is contained in:
Lorenz Wrobel 2024-08-22 03:15:19 +02:00 committed by GitHub
parent 6b660a4e6a
commit a521c4e7cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/net/minestom/server/collision/EntityCollision.java
View File

@ -32,12 +32,13 @@ final class EntityCollision {
if (e.getBoundingBox().intersectBox(e.getPosition().sub(point), boundingBox)) { if (e.getBoundingBox().intersectBox(e.getPosition().sub(point), boundingBox)) {
var p = Pos.fromPoint(point); var p = Pos.fromPoint(point);
result.add(new EntityCollisionResult(p, e, Vec.ZERO, 0)); result.add(new EntityCollisionResult(p, e, Vec.ZERO, 0));
continue;
} }
// Check collisions with entity // Check collisions with entity
e.getBoundingBox().intersectBoxSwept(point, entityVelocity, e.getPosition(), boundingBox, sweepResult); boolean intersected = e.getBoundingBox().intersectBoxSwept(point, entityVelocity, e.getPosition(), boundingBox, sweepResult);
if (sweepResult.res < 1) { if (intersected && sweepResult.res < 1) {
var p = Pos.fromPoint(point).add(entityVelocity.mul(sweepResult.res)); var p = Pos.fromPoint(point).add(entityVelocity.mul(sweepResult.res));
Vec direction = new Vec(sweepResult.collidedPositionX, sweepResult.collidedPositionY, sweepResult.collidedPositionZ); Vec direction = new Vec(sweepResult.collidedPositionX, sweepResult.collidedPositionY, sweepResult.collidedPositionZ);
result.add(new EntityCollisionResult(p, e, direction, sweepResult.res)); result.add(new EntityCollisionResult(p, e, direction, sweepResult.res));