From 90098676c20fe274ca7990f2ff2d295709a1a575 Mon Sep 17 00:00:00 2001 From: Mario Date: Mon, 2 Jan 2017 12:37:42 +1000 Subject: [PATCH] Fix a crash caused by stupid maps --- qcsrc/common/triggers/trigger/jumppads.qc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qcsrc/common/triggers/trigger/jumppads.qc b/qcsrc/common/triggers/trigger/jumppads.qc index 5a279561d3..746270877b 100644 --- a/qcsrc/common/triggers/trigger/jumppads.qc +++ b/qcsrc/common/triggers/trigger/jumppads.qc @@ -222,7 +222,7 @@ bool jumppad_push(entity this, entity targ) } if(this.enemy.target) - SUB_UseTargets(this.enemy, targ, targ); // TODO: do we need targ as trigger too? + SUB_UseTargets(this.enemy, targ, this); if (targ.flags & FL_PROJECTILE) { @@ -418,6 +418,9 @@ bool target_push_send(entity this, entity to, float sf) void target_push_use(entity this, entity actor, entity trigger) { + if(trigger.classname == "trigger_push" || trigger == this) + return; // WTF, why is this a thing + jumppad_push(this, actor); } -- 2.39.2