Merge branch 'master' into Juhu/battle-royale

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / ent_cs.qc

diff --git a/qcsrc/common/ent_cs.qc b/qcsrc/common/ent_cs.qc
index 5366371458fe52fadb86e3c2d7fc3dd8b2ca44db..222e74900298be4c56dd708b2f1234ebaab368ac 100644 (file)
--- a/qcsrc/common/ent_cs.qc
+++ b/qcsrc/common/ent_cs.qc
@@ -188,6 +188,7 @@ ENTCS_PROP(SOLID, true, sv_solid, solid, ENTCS_SET_NORMAL,
                        {
                                if (radar_showenemies) break;
                                if (SAME_TEAM(to, player)) break;
+                               if (SAME_SQUAD(to, player)) break;
                                if (!(IS_PLAYER(to) || INGAME(to))) break;
                        }
                        sf &= ENTCS_PUBLICMASK; // no private updates