nothing to see here, move along...

[xonotic/darkplaces.git] / sv_phys.c

diff --git a/sv_phys.c b/sv_phys.c
index 0e37ed3b6dfad40eef7abebd7edf606f15e879cf..555aa44b2df3d1c9d1a324f20836a809405658fb 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -657,8 +657,11 @@ void SV_PushMove (prvm_edict_t *pusher, float movetime)
 
                // if the entity is standing on the pusher, it will definitely be moved
                if (!(((int)check->fields.server->flags & FL_ONGROUND) && PRVM_PROG_TO_EDICT(check->fields.server->groundentity) == pusher))
+               {
+                       // if the entity is not inside the pusher's final position, leave it alone
                        if (!SV_ClipMoveToEntity(pusher, check->fields.server->origin, check->fields.server->mins, check->fields.server->maxs, check->fields.server->origin).startsolid)
                                continue;
+               }
 
                if (forward[0] != 1 || left[1] != 1) // quick way to check if any rotation is used
                {