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 4f244a8f5a88167c4724cdc5d5892e2c935ae690..b852e3f05b8652b6c35a242148167f2180034156 100644 (file)
--- a/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@ -693,8 +693,12 @@ void SV_PlayerPhysics()
        maxspd_mod = 1;
        if(g_minstagib && (self.items & IT_INVINCIBLE))
                maxspd_mod *= cvar("g_minstagib_speed_highspeed");
-       if(g_nexball && self.ballcarried)
-               maxspd_mod *= cvar("g_nexball_basketball_carrier_highspeed");
+       if(self.ballcarried)
+               if(g_nexball)
+                       maxspd_mod *= cvar("g_nexball_basketball_carrier_highspeed");
+               else if(g_keepaway)
+                       maxspd_mod *= cvar("g_keepaway_ballcarrier_highspeed");
+
        if(g_runematch)
        {
                if(self.runes & RUNE_SPEED)