From: terencehill <piuntn@gmail.com>
Date: Thu, 19 Mar 2020 23:21:16 +0000 (+0100)
Subject: Remove redundant setting of air_finished that gets overriden in DrownPlayer with... 
X-Git-Tag: xonotic-v0.8.5~1144^2~8^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7f79df2d74;p=xonotic%2Fxonotic-data.pk3dir.git

Remove redundant setting of air_finished that gets overriden in DrownPlayer with the proper value (g_balance_contents_drowndelay)
---

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;
 	}
 }