Fix health regeneration starting when player is frozen, more easily noticeable settin...

diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc
index 95c8790c3055c720c448b9494996ee41bd552727..97ab6854610013570cfb3d3cf2bc271d6c19d959 100644 (file)
--- a/qcsrc/server/mutators/gamemode_freezetag.qc
+++ b/qcsrc/server/mutators/gamemode_freezetag.qc
@@ -360,6 +360,8 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerPreThink)
        float n;
        vector revive_extra_size;
 
+       if(self.freezetag_frozen && !self.freezetag_revive_progress)
+               self.health = 1;
        if(next_round || (time > warmup - autocvar_g_freezetag_warmup && time < warmup))
                return 1; // already waiting for next round to start
 

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index 1f1137e4b845b151321d1501c5dbdca9e325b2fd..08841f571841126125f8b06dbf61c11bd557694c 100644 (file)
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -104,8 +104,9 @@ void minstagib_ammocheck(void)
                minstagib_stop_countdown(self);
        else if (self.ammo_cells > 0 || (self.items & IT_UNLIMITED_WEAPON_AMMO))
        {
+               if (self.minstagib_needammo)
+                       self.health = 100;
                minstagib_stop_countdown(self);
-               self.health = 100;
        }
        else
        {