Restore a safety check removed in the previous merge commit and put it in better...

diff --git a/qcsrc/common/physics/movetypes/movetypes.qc b/qcsrc/common/physics/movetypes/movetypes.qc
index 651b6f3d642e7f861fe1cb4adcb439b5a7d6a8e3..a6ac13c1d5650b879db2ddccb7b6ff4427f0bbd4 100644 (file)
--- a/qcsrc/common/physics/movetypes/movetypes.qc
+++ b/qcsrc/common/physics/movetypes/movetypes.qc
@@ -717,7 +717,7 @@ bool _Movetype_PushEntity(entity this, vector push, bool dolink)  // SV_PushEnti
 
        _Movetype_LinkEdict(this, dolink);
 
-       if((this.solid >= SOLID_TRIGGER && trace_fraction < 1 && (!IS_ONGROUND(this) || this.groundentity != trace_ent)))
+       if((this.solid >= SOLID_TRIGGER && trace_ent && trace_fraction < 1 && (!IS_ONGROUND(this) || this.groundentity != trace_ent)))
                _Movetype_Impact(this, trace_ent);
 
        return (this.origin == last_origin); // false if teleported by touch