From: Mario <mario@smbclan.net>
Date: Mon, 26 Sep 2016 10:47:28 +0000 (+1000)
Subject: Fix respawning instantly while jump button is held and respawning is forced
X-Git-Tag: xonotic-v0.8.2~566
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=48ff84c8379f775aaa81f036860feb81cc472d22;p=xonotic%2Fxonotic-data.pk3dir.git

Fix respawning instantly while jump button is held and respawning is forced
---

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index dd9aab7fa..e42807ec5 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -2333,7 +2333,7 @@ void PlayerPreThink (entity this)
 					{
 						if ((this.respawn_flags & RESPAWN_FORCE) && !(this.respawn_time < this.respawn_time_max))
 							this.deadflag = DEAD_RESPAWNING;
-						else if (!button_pressed || (this.respawn_flags & RESPAWN_FORCE))
+						else if (!button_pressed || (time >= this.respawn_time_max && (this.respawn_flags & RESPAWN_FORCE)))
 							this.deadflag = DEAD_DEAD;
 						break;
 					}