From e5a7c73bbeafcf5d0f6afc71c24f708bf9954e20 Mon Sep 17 00:00:00 2001
From: AzaezelX <quillus@hotmail.com>
Date: Sun, 21 Jan 2024 13:05:37 -0600
Subject: [PATCH] remove arbitrary impact sound spam 1) don't call them when
 onimpact threshold isn't crossed. 2) *definitely* don't call them with an
 arbirtary /3 threshold

---
 Engine/source/T3D/player.cpp | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/Engine/source/T3D/player.cpp b/Engine/source/T3D/player.cpp
index 478b7b6b7..c1990cc70 100644
--- a/Engine/source/T3D/player.cpp
+++ b/Engine/source/T3D/player.cpp
@@ -5075,8 +5075,12 @@ F32 Player::_doCollisionImpact( const Collision *collision, bool fallingCollisio
    if ( ((bd > mDataBlock->minImpactSpeed && fallingCollision) || bd > mDataBlock->minLateralImpactSpeed) 
       && !mMountPending )
    {
-      if ( !isGhost() )
-         onImpact( collision->object, collision->normal * bd );
+      if (!isGhost())
+      {
+         onImpact(collision->object, collision->normal * bd);
+         mImpactSound = PlayerData::ImpactNormal;
+         setMaskBits(ImpactMask);
+      }
 
       if (mDamageState == Enabled && mState != RecoverState) 
       {
@@ -5101,13 +5105,6 @@ F32 Player::_doCollisionImpact( const Collision *collision, bool fallingCollisio
       }
    }
 
-   if ( isServerObject() && 
-      (bd > (mDataBlock->minImpactSpeed / 3.0f) || bd > (mDataBlock->minLateralImpactSpeed / 3.0f )) ) 
-   {
-      mImpactSound = PlayerData::ImpactNormal;
-      setMaskBits(ImpactMask);
-   }
-
    return bd;
 }