Synchronize changes from 1.6 master branch [ci skip]

8f85924 Fix jump control triggering weapon zoom while aiming (#2798) (#4454)

Author: github-actions[bot]

Client/core/CKeyBinds.cpp

@@ -1950,7 +1950,7 @@ void CKeyBinds::DoPostFramePulse()
 
             // * Enter Exit
             // * Change View
-            cs.ButtonSquare = (!bEnteringVehicle && g_bcControls[11].bState) ? 255 : 0;            // Jump
+            cs.ButtonSquare = (!bEnteringVehicle && !bAimingWeapon && g_bcControls[11].bState) ? 255 : 0;            // Jump
             cs.ButtonCross = (g_bcControls[12].bState) ? 255 : 0;                                  // Sprint
             cs.ShockButtonR = (g_bcControls[13].bState) ? 255 : 0;                                 // Look Behind
             cs.ShockButtonL = (g_bcControls[14].bState) ? 255 : 0;                                 // Crouch