X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_physics.qc;h=50518040b7ce07649d804af7504f15b1a2c87787;hp=43c7be517958e718b864f25bbf46e699b741c90d;hb=31bf64ba7821ebb5c0aba8a154472810074ed11e;hpb=b9efc43ac4ee0875aae8223bce90b1f08937cd93

diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc
index 43c7be5179..50518040b7 100644
--- a/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@ -23,14 +23,15 @@ void PlayerJump (void)
 		return; // no jumping while blocked
 
 	float doublejump = FALSE;
+	float mjumpheight = autocvar_sv_jumpvelocity;
 
 	player_multijump = doublejump;
+	player_jumpheight = mjumpheight;
 	if(MUTATOR_CALLHOOK(PlayerJump))
 		return;
 
 	doublejump = player_multijump;
-
-	float mjumpheight;
+	mjumpheight = player_jumpheight;
 
 	if (autocvar_sv_doublejump)
 	{
@@ -47,7 +48,6 @@ void PlayerJump (void)
 		}
 	}
 
-	mjumpheight = autocvar_sv_jumpvelocity;
 	if (self.waterlevel >= WATERLEVEL_SWIMMING)
 	{
 		self.velocity_z = self.stat_sv_maxspeed * 0.7;
@@ -1250,22 +1250,22 @@ void SV_PlayerPhysics()
 		}
 	}
 
-	if((g_cts || g_race) && !IS_OBSERVER(self)) {
-		if(vlen(self.velocity - self.velocity_z * '0 0 1') > speedaward_speed) {
+	if((g_cts || g_race) && !IS_OBSERVER(self))
+	{
+		if(vlen(self.velocity - self.velocity_z * '0 0 1') > speedaward_speed)
+		{
 			speedaward_speed = vlen(self.velocity - self.velocity_z * '0 0 1');
 			speedaward_holder = self.netname;
 			speedaward_uid = self.crypto_idfp;
 			speedaward_lastupdate = time;
 		}
-		if(speedaward_speed > speedaward_lastsent && time - speedaward_lastupdate > 1) {
-			string rr;
-			if(g_cts)
-				rr = CTS_RECORD;
-			else
-				rr = RACE_RECORD;
+		if(speedaward_speed > speedaward_lastsent && time - speedaward_lastupdate > 1)
+		{
+			string rr = (g_cts) ? CTS_RECORD : RACE_RECORD;
 			race_send_speedaward(MSG_ALL);
 			speedaward_lastsent = speedaward_speed;
-			if (speedaward_speed > speedaward_alltimebest && speedaward_uid != "") {
+			if (speedaward_speed > speedaward_alltimebest && speedaward_uid != "")
+			{
 				speedaward_alltimebest = speedaward_speed;
 				speedaward_alltimebest_holder = speedaward_holder;
 				speedaward_alltimebest_uid = speedaward_uid;