From: terencehill Date: Wed, 8 Feb 2023 21:15:51 +0000 (+0100) Subject: Restore a safety check removed in the previous merge commit and put it in better... X-Git-Tag: xonotic-v0.8.6~172 X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;ds=sidebyside;h=1d8f8ba43f23e2d949571624ba2ae2de9cdd24a8;p=xonotic%2Fxonotic-data.pk3dir.git Restore a safety check removed in the previous merge commit and put it in better place (matching engine behaviour) --- diff --git a/qcsrc/common/physics/movetypes/movetypes.qc b/qcsrc/common/physics/movetypes/movetypes.qc index 651b6f3d6..a6ac13c1d 100644 --- 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