Merge branch 'samual/keepaway' into fruitiex/freezetag_vs_keepaway

[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 297e16771268949909a7c3bfe7c58f5d1350b96b..b852e3f05b8652b6c35a242148167f2180034156 100644 (file)
--- a/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@ -46,6 +46,9 @@ When you press the jump key
 */
 void PlayerJump (void)
 {
+       if(g_freezetag && self.freezetag_frozen)
+               return; // no jumping in freezetag when frozen
+
        float mjumpheight;
        float doublejump;