Merge branch 'master' into Juhu/battle-royale

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

diff --git a/qcsrc/server/impulse.qc b/qcsrc/server/impulse.qc
index be66fe968c2b6a2eadc8ac35b8390805ad519289..f98545db0c3aa9ff674083950b46d3e21ec32092 100644 (file)
--- a/qcsrc/server/impulse.qc
+++ b/qcsrc/server/impulse.qc
@@ -437,7 +437,7 @@ IMPULSE(waypoint_personal_death)
 
 IMPULSE(waypoint_here_follow)
 {
-       if (!teamplay) return;
+       if (!teamplay && !IN_SQUAD(this)) return;
        if (IS_DEAD(this)) return;
        if (!MUTATOR_CALLHOOK(HelpMePing, this))
        {