From: Juhu <5894800-Juhu_@users.noreply.gitlab.com>
Date: Mon, 30 Jan 2023 03:16:12 +0000 (+0100)
Subject: q3df compat: minor improvements to make trigger_push_velocity behaviour more consiste... 
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2c5fb72a6c1cf2ff5730780074d2c22afd6cea40;p=xonotic%2Fxonotic-data.pk3dir.git

q3df compat: minor improvements to make trigger_push_velocity behaviour more consistent when using ADD_* spawnflags
---

diff --git a/qcsrc/common/mapobjects/trigger/jumppads.qc b/qcsrc/common/mapobjects/trigger/jumppads.qc
index da2f8dc0b..10addb088 100644
--- a/qcsrc/common/mapobjects/trigger/jumppads.qc
+++ b/qcsrc/common/mapobjects/trigger/jumppads.qc
@@ -342,7 +342,7 @@ bool jumppad_push(entity this, entity targ, bool is_velocity_pad)
 		}
 	}
 
-	if(!is_pushed) UNSET_ONGROUND(targ);
+	if(!is_pushed || !(this.spawnflags & ADD_Z)) UNSET_ONGROUND(targ);
 
 #ifdef CSQC
 	if (targ.flags & FL_PROJECTILE)
@@ -370,7 +370,7 @@ bool jumppad_push(entity this, entity targ, bool is_velocity_pad)
 
 		// prevent sound spam when a player hits the jumppad more than once
 		// or when a dead player gets stuck in the jumppad for some reason
-		if(!is_pushed && this.pushltime < time && !(IS_DEAD(targ) && targ.velocity == '0 0 0'))
+		if((!is_pushed || !((this.spawnflags & ADD_XY) && (this.spawnflags & ADD_Z))) && this.pushltime < time && !(IS_DEAD(targ) && targ.velocity == '0 0 0'))
 		{
 			// flash when activated
 			Send_Effect(EFFECT_JUMPPAD, targ.origin, targ.velocity, 1);