From 21ff042aa3ee24eb7693879172d57c0ad5eb7249 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Wed, 2 Apr 2025 18:54:27 +0300
Subject: [PATCH] fix: non-local players hitboxes incorrect behaviour

---
 src/objects/Player.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/objects/Player.cpp b/src/objects/Player.cpp
index cbedd676..dce13475 100644
--- a/src/objects/Player.cpp
+++ b/src/objects/Player.cpp
@@ -82,6 +82,17 @@ void Player::updateEntity() {
                           "will be respawned";
         eid = ENTITY_AUTO;
     }
+    auto hitbox = getHitbox();
+    if (hitbox == nullptr) {
+        return;
+    }
+    hitbox->linearDamping = PLAYER_GROUND_DAMPING;
+    hitbox->verticalDamping = flight;
+    hitbox->gravityScale = flight ? 0.0f : 1.0f;
+    if (flight || !hitbox->grounded) {
+        hitbox->linearDamping = PLAYER_AIR_DAMPING;
+    }
+    hitbox->type = noclip ? BodyType::KINEMATIC : BodyType::DYNAMIC;
 }
 
 Hitbox* Player::getHitbox() {
@@ -129,12 +140,7 @@ void Player::updateInput(PlayerInput& input, float delta) {
         dir = glm::normalize(dir);
         hitbox->velocity += dir * speed * delta * 9.0f;
     }
-
-    hitbox->linearDamping = PLAYER_GROUND_DAMPING;
-    hitbox->verticalDamping = flight;
-    hitbox->gravityScale = flight ? 0.0f : 1.0f;
     if (flight) {
-        hitbox->linearDamping = PLAYER_AIR_DAMPING;
         if (input.jump) {
             hitbox->velocity.y += speed * delta * 9;
         }
@@ -142,15 +148,9 @@ void Player::updateInput(PlayerInput& input, float delta) {
             hitbox->velocity.y -= speed * delta * 9;
         }
     }
-    if (!hitbox->grounded) {
-        hitbox->linearDamping = PLAYER_AIR_DAMPING;
-    }
-
     if (input.jump && hitbox->grounded) {
         hitbox->velocity.y = JUMP_FORCE;
     }
-
-    hitbox->type = noclip ? BodyType::KINEMATIC : BodyType::DYNAMIC;
 }
 
 void Player::updateSelectedEntity() {