q3bsp curve collisions (technically it can collide against any triangle mesh)

[xonotic/darkplaces.git] / sv_phys.c

diff --git a/sv_phys.c b/sv_phys.c
index 6cfd9058fa9fbf204516c70ad96a2a0a8a5b72c8..6cfa187eb309eb91b1466ee978484eec52750ff7 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -521,7 +521,7 @@ trace_t SV_PushEntity (edict_t *ent, vec3_t push, vec3_t pushangles)
        ent->v->angles[1] += trace.fraction * pushangles[1];
        SV_LinkEdict (ent, true);
 
-       if (trace.ent && (!((int)ent->v->flags & FL_ONGROUND) || ent->v->groundentity != EDICT_TO_PROG(trace.ent)))
+       if (trace.fraction < 1 && trace.ent && (!((int)ent->v->flags & FL_ONGROUND) || ent->v->groundentity != EDICT_TO_PROG(trace.ent)))
                SV_Impact (ent, trace.ent);
        return trace;
 }
@@ -1316,7 +1316,7 @@ void SV_Physics (void)
 
                if (i > 0 && i <= MAX_SCOREBOARD)
                {
-                       if (!svs.connectedclients[i-1])
+                       if (!svs.connectedclients[i-1] || !svs.connectedclients[i-1]->spawned)
                                continue;
                        // connected slot
                        // call standard client pre-think