Restore old code in the hope it fixes #2205 for real. This commit together with the...

[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 070197d7db79c6533ba607e41839857febd62a02..f4ef79eda495f5e064ed81146b7e0fb24dacca9c 100644 (file)
--- a/qcsrc/common/ent_cs.qc
+++ b/qcsrc/common/ent_cs.qc
@@ -181,7 +181,6 @@ ENTCS_PROP(FRAGS, true, frags, ENTCS_SET_NORMAL,
                WriteShort(chan, sf);
                FOREACH(EntCSProps, sf & BIT(it.m_id),
                {
-                       it.m_set(this, player);
                        it.m_send(chan, this);
                });
                return true;
@@ -198,6 +197,7 @@ ENTCS_PROP(FRAGS, true, frags, ENTCS_SET_NORMAL,
                entity player = this.owner;
                FOREACH(EntCSProps, it.m_check(this, player),
                {
+                       it.m_set(this, player);
                        this.SendFlags |= BIT(it.m_id);
                });
                setorigin(this, this.origin); // relink
@@ -210,6 +210,11 @@ ENTCS_PROP(FRAGS, true, frags, ENTCS_SET_NORMAL,
                setthink(e, entcs_think);
                e.nextthink = time;
                Net_LinkEntity(e, false, 0, entcs_send);
+               if (!IS_REAL_CLIENT(player)) return;
+               FOREACH_CLIENT(true, {
+                       assert(CS(it).entcs);
+                       _entcs_send(CS(it).entcs, msg_entity = player, BITS(23), MSG_ONE);
+               });
        }
 
        void entcs_detach(entity player)