Remove redundant setting of air_finished that gets overriden in DrownPlayer with...

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index dd906931176d48a4293b2792044ff4258da73496..70b0e4ed0430a3acd776c5a5c706ffc1436136af 100644 (file)
--- 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;
 
        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;
 
        this.waterlevel = WATERLEVEL_NONE;
        this.watertype = CONTENT_EMPTY;
 

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index ea89794357517cb79b5a83887712579e067dfc6b..2f2de95b38f0e772b0cdb7023c698fc2cdc27c9f 100644 (file)
--- 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.flags &= ~FL_INWATER;
                        this.dmgtime = 0;
                }

-               this.air_finished = time + 12;

        }
 }
 
        }
 }