From: Mario <zacjardine@y7mail.com>
Date: Tue, 4 Nov 2014 06:33:23 +0000 (+1100)
Subject: Merge branch 'master' into Mario/buffs
X-Git-Tag: xonotic-v0.8.0~171^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=20256058c4de97b81ee5aaedaa383a99010752f0;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/buffs
---

20256058c4de97b81ee5aaedaa383a99010752f0
diff --cc qcsrc/server/cl_physics.qc
index 4bfc28870,43c7be517..7563cf520
--- a/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@@ -19,11 -19,12 +19,14 @@@ When you press the jump ke
  */
  void PlayerJump (void)
  {
+ 	if(self.player_blocked)
+ 		return; // no jumping while blocked
+ 
  	float doublejump = FALSE;
 +	float mjumpheight = autocvar_sv_jumpvelocity;
  
  	player_multijump = doublejump;
 +	player_jumpheight = mjumpheight;
  	if(MUTATOR_CALLHOOK(PlayerJump))
  		return;