From: terencehill <piuntn@gmail.com>
Date: Thu, 25 Jan 2018 19:17:54 +0000 (+0100)
Subject: When game is frozen and player is drowning or inside lava don't damage them (don... 
X-Git-Tag: xonotic-v0.8.5~2369
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=283e7f5a744ac3bbb276feccf13db12d35d54836;p=xonotic%2Fxonotic-data.pk3dir.git

When game is frozen and player is drowning or inside lava don't damage them (don't play effect sounds as well)
---

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index d79445d09..3d5f951a4 100644
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -2665,7 +2665,7 @@ void PlayerPreThink (entity this)
 
 void DrownPlayer(entity this)
 {
-	if(IS_DEAD(this))
+	if(IS_DEAD(this) || game_stopped || time < game_starttime)
 		return;
 
 	if (this.waterlevel != WATERLEVEL_SUBMERGED || this.vehicle)
diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 1e5435795..d2cc9b960 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -126,6 +126,9 @@ void CreatureFrame_FallDamage(entity this)
 
 void CreatureFrame_All()
 {
+	if(game_stopped || time < game_starttime)
+		return;
+
 	IL_EACH(g_damagedbycontents, it.damagedbycontents,
 	{
 		if (it.move_movetype == MOVETYPE_NOCLIP) continue;