fixed SOLID_NOT relink touching triggers bug (which was causing CTF flags to be repea...

[xonotic/darkplaces.git] / world.c

diff --git a/world.c b/world.c
index 0a9a58618c600d49105384988246abffe0925f4a..64b493a88c2c6eb9d8eaca76b5353cdcdaced9e8 100644 (file)
--- a/world.c
+++ b/world.c
@@ -386,13 +386,10 @@ void SV_LinkEdict (prvm_edict_t *ent, qboolean touch_triggers)
                ent->fields.server->absmax[2] += 1;
        }
 
-       //if (ent->fields.server->solid == SOLID_NOT)
-       //      return;
-
        SV_LinkEdict_AreaGrid(ent);
 
 // if touch_triggers, touch all entities at this node and descend for more
-       if (touch_triggers)
+       if (touch_triggers && ent->fields.server.solid != SOLID_NOT)
                SV_TouchAreaGrid(ent);
 }