Merge branch 'master' into Mario/rifle_arena

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cl_physics.qc

diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc
index 5ce7b7d475f4d6848442b8fa9761106e5927ed2c..02a3b1c0956b190bff9d1f68ba3c9d805bfd68f4 100644 (file)
--- a/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@ -23,7 +23,7 @@ When you press the jump key
 */
 void PlayerJump (void)
 {
-       if(self.freezetag_frozen)
+       if(self.freezetag_frozen && !self.dodging_action)
                return; // no jumping in freezetag when frozen
 
        float mjumpheight;