From: terencehill <piuntn@gmail.com>
Date: Wed, 28 Oct 2020 00:27:00 +0000 (+0100)
Subject: Attempt to prevent sound spam when a dead player gets stuck in the jumppad for some... 
X-Git-Tag: xonotic-v0.8.5~710
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ffa817d810a1cdb17e2cf53e81059633a7785752;p=xonotic%2Fxonotic-data.pk3dir.git

Attempt to prevent sound spam when a dead player gets stuck in the jumppad for some reason
---

diff --git a/qcsrc/common/mapobjects/trigger/jumppads.qc b/qcsrc/common/mapobjects/trigger/jumppads.qc
index a6128d207..06842395b 100644
--- a/qcsrc/common/mapobjects/trigger/jumppads.qc
+++ b/qcsrc/common/mapobjects/trigger/jumppads.qc
@@ -192,7 +192,9 @@ bool jumppad_push(entity this, entity targ)
 		// reset tracking of oldvelocity for impact damage (sudden velocity changes)
 		targ.oldvelocity = targ.velocity;
 
-		if(this.pushltime < time)  // prevent "snorring" sound when a player hits the jumppad more than once
+		// 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(this.pushltime < time && !(IS_DEAD(targ) && targ.velocity == '0 0 0'))
 		{
 			// flash when activated
 			Send_Effect(EFFECT_JUMPPAD, targ.origin, targ.velocity, 1);