Merge branch 'master' into mirceakitsune/multijump

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

diff --git a/qcsrc/server/mutators/mutator_dodging.qc b/qcsrc/server/mutators/mutator_dodging.qc
index 8e52ab13e567fe6258c3f5bea2c7caa3b5e0cfc3..d3b8e6d64ee04d26d9317f28894579ac6335eedc 100644 (file)
--- a/qcsrc/server/mutators/mutator_dodging.qc
+++ b/qcsrc/server/mutators/mutator_dodging.qc
@@ -105,6 +105,8 @@ MUTATOR_HOOKFUNCTION(dodging_PlayerPhysics) {
 
        // the up part of the dodge is a single shot action
        if (self.dodging_single_action == 1) {
+               self.flags &~= FL_ONGROUND;
+
                self.velocity = 
                          self.velocity 
                        + (cvar("sv_dodging_up_speed") * v_up);
@@ -244,8 +246,6 @@ MUTATOR_HOOKFUNCTION(dodging_GetPressedKeys) {
        if (dodge_detected == 1) {
                self.last_dodging_time = time;
 
-               self.flags &~= FL_ONGROUND;
-
                self.dodging_action = 1;
                self.dodging_single_action = 1;