]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix respawning instantly while jump button is held and respawning is forced
authorMario <mario@smbclan.net>
Mon, 26 Sep 2016 10:47:28 +0000 (20:47 +1000)
committerMario <mario@smbclan.net>
Mon, 26 Sep 2016 10:47:28 +0000 (20:47 +1000)
qcsrc/server/client.qc

index dd9aab7fabc0c55c29c85680c2e32cc24f9ee434..e42807ec5de086baf5572a1c23f3398b165b6a3d 100644 (file)
@@ -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;
                                        }