Merge remote-tracking branch 'origin/mrbougo/tooltips_fix'

[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 8e964054b7858f40d5158f4af0fc5a6ac6f4e694..a2773fedfd5a00ad6b7dfe4cf605aeecd88fd444 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(g_freezetag && self.freezetag_frozen)
+       if(self.freezetag_frozen)
                return; // no jumping in freezetag when frozen
 
        float mjumpheight;
@@ -796,8 +796,6 @@ void SV_PlayerPhysics()
                bot_think();
        }
        
-       MUTATOR_CALLHOOK(PlayerPhysics);
-
        self.items &~= IT_USING_JETPACK;
 
        if(self.classname == "player")
@@ -835,6 +833,8 @@ void SV_PlayerPhysics()
        if(time < self.ladder_time)
                self.disableclientprediction = 1;
 
+       MUTATOR_CALLHOOK(PlayerPhysics);
+
        maxspd_mod = 1;
 
        swampspd_mod = 1;