fix a thinko on clip.trace.ent = sv.edicts (it should only be set if startsolid or...

[xonotic/darkplaces.git] / world.c

diff --git a/world.c b/world.c
index a88858862f8aa411ddfd16c36e9b90b1863d3fcc..b337fe2e0185afc408a83cdb148b932f849280e1 100644 (file)
--- a/world.c
+++ b/world.c
@@ -636,7 +636,8 @@ trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
 
        // clip to world
        clip.trace = SV_ClipMoveToEntity(sv.edicts, clip.start, clip.mins, clip.maxs, clip.end, clip.type);
-       clip.trace.ent = sv.edicts;
+       if (clip.trace.startsolid || clip.trace.fraction < 1)
+               clip.trace.ent = sv.edicts;
        if (clip.type == MOVE_WORLDONLY)
                return clip.trace;