X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=world.c;h=b337fe2e0185afc408a83cdb148b932f849280e1;hp=a88858862f8aa411ddfd16c36e9b90b1863d3fcc;hb=59da04aacea8c3898844b6f3ada1fcbda3ccf780;hpb=6f53a7389f176401a73b425e366498ea6a22f9fd

diff --git a/world.c b/world.c
index a8885886..b337fe2e 100644
--- 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;