When game is frozen and player is drowning or inside lava don't damage them (don...

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index d79445d09329e50c8160e2f414e710208df3f320..3d5f951a42e0b6b7d5be0ba019692c2aea9d1791 100644 (file)
--- 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 1e5435795ede10837845c36ebd35104ea2ad96d3..d2cc9b960b650dbcdab5fdeb39e616c7e44a3cb0 100644 (file)
--- 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;