X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_physics.qc;h=6f05c456804e73a8ba4371067dd21ff3ad3e3967;hp=bdac55e6755af00f6c2191102065ef49346c8732;hb=3adaa0873ad9eac20f32e6e3fc0455d4f9e044cd;hpb=34863a007ec889fda4c131fe4ed5e959c4832763

diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc
index bdac55e675..6f05c45680 100644
--- a/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@ -19,6 +19,9 @@ When you press the jump key
 */
 void PlayerJump (void)
 {
+	if(self.player_blocked)
+		return; // no jumping while blocked
+
 	float doublejump = FALSE;
 
 	player_multijump = doublejump;
@@ -636,9 +639,7 @@ void SV_PlayerPhysics()
 
 	maxspd_mod = 1;
 	if(self.ballcarried)
-		if(g_nexball)
-			maxspd_mod *= autocvar_g_nexball_basketball_carrier_highspeed;
-		else if(g_keepaway)
+		if(g_keepaway)
 			maxspd_mod *= autocvar_g_keepaway_ballcarrier_highspeed;
 
 	maxspd_mod *= autocvar_g_movement_highspeed;