Tuning

solcloud · Oct 22, 2022 · 891bbe5 · 891bbe5
1 parent 479854a
commit 891bbe5
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/server/src/Traits/Player/GravityTrait.php b/server/src/Traits/Player/GravityTrait.php
@@ -36,8 +36,6 @@ private function calculateGravity(Point $start, int $amount): int
             $candidate->setY($y);
             $floorCandidate = $this->world->findFloor($candidate, $this->getBoundingRadius());
             if ($floorCandidate) {
-                $sound = new SoundEvent($this->getPositionImmutable()->setY($y), SoundType::PLAYER_GROUND_TOUCH);
-                $this->world->makeSound($sound->setPlayer($this)->setSurface($floorCandidate));
                 $this->setActiveFloor($floorCandidate);
                 $targetYPosition = $y;
                 break;
@@ -47,24 +45,31 @@ private function calculateGravity(Point $start, int $amount): int
                 break;
             }
         }
+
         return $targetYPosition;
     }
 
     private function setActiveFloor(?Floor $floor): void
     {
         $this->activeFloor = $floor;
         if ($floor) {
-            $this->checkFallDamage($floor->getY());
+            $this->checkFallDamage($floor);
             $this->removeEvent($this->eventIdJump);
             $this->fallHeight = 0;
         } else {
             $this->fallHeight = $this->position->y;
         }
     }
 
-    private function checkFallDamage(int $floorHeight): void
+    private function checkFallDamage(Floor $floor): void
     {
+        $floorHeight = $floor->getY();
         $fallHeight = $this->fallHeight - $floorHeight;
+        if ($fallHeight > 3 * Setting::playerObstacleOvercomeHeight()) {
+            $sound = new SoundEvent($this->getPositionImmutable()->setY($floorHeight), SoundType::PLAYER_GROUND_TOUCH);
+            $this->world->makeSound($sound->setPlayer($this)->setSurface($floor));
+        }
+
         $threshold = Setting::playerFallDamageThreshold();
         if ($fallHeight < $threshold) {
             return;