Merge branch 'main' into heightmaps

2024-10-04 16:58:50 +03:00 · 2024-10-04 16:58:50 +03:00 · 073ef11cfa
commit 073ef11cfa
parent a47b650591 f63ab345ea
1 changed files with 1 additions and 1 deletions
--- a/src/objects/Player.cpp
+++ b/src/objects/Player.cpp
@ -152,7 +152,7 @@ void Player::postUpdate() {
    auto& hitbox = entity->getRigidbody().hitbox;
    position = hitbox.position;

-    if (flight && hitbox.grounded) {
+    if (flight && hitbox.grounded && !noclip) {
        flight = false;
    }
    if (spawnpoint.y <= 0.1) {