From: Mario <mario@smbclan.net>
Date: Mon, 2 Jan 2017 02:37:42 +0000 (+1000)
Subject: Fix a crash caused by stupid maps
X-Git-Tag: xonotic-v0.8.2~333
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=90098676c20fe274ca7990f2ff2d295709a1a575;ds=sidebyside

Fix a crash caused by stupid maps
---

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);
 }