From 7f79df2d74210253371fa24fab020c7f161113fc Mon Sep 17 00:00:00 2001 From: terencehill Date: Fri, 20 Mar 2020 00:21:16 +0100 Subject: [PATCH] Remove redundant setting of air_finished that gets overriden in DrownPlayer with the proper value (g_balance_contents_drowndelay) --- qcsrc/server/client.qc | 2 +- qcsrc/server/sv_main.qc | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc index dd9069311..70b0e4ed0 100644 --- a/qcsrc/server/client.qc +++ b/qcsrc/server/client.qc @@ -647,7 +647,7 @@ void PutPlayerInServer(entity this) STAT(BUFFS, this) = 0; STAT(BUFF_TIME, this) = 0; - this.air_finished = time + 12; + this.air_finished = time + autocvar_g_balance_contents_drowndelay; this.waterlevel = WATERLEVEL_NONE; this.watertype = CONTENT_EMPTY; diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc index ea8979435..2f2de95b3 100644 --- a/qcsrc/server/sv_main.qc +++ b/qcsrc/server/sv_main.qc @@ -89,7 +89,6 @@ void CreatureFrame_Liquids(entity this) this.flags &= ~FL_INWATER; this.dmgtime = 0; } - this.air_finished = time + 12; } } -- 2.39.2