Unfreze player before disconnecting/spectating

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index c5304cbce730c89f63deaa9542b2a7e3341cbff8..f8ba5e16c4b7f61e381addc251520c47d0260f09 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -391,6 +391,8 @@ void PutObserverInServer (void)
 
        Portal_ClearAll(self);
        
+       Unfreeze(self);
+       
        if(self.alivetime)
        {
                if(!inWarmupStage)
@@ -1623,6 +1625,8 @@ void ClientDisconnect (void)
        MUTATOR_CALLHOOK(ClientDisconnect);
 
        Portal_ClearAll(self);
+       
+       Unfreeze(self);
 
        RemoveGrapplingHook(self);
 

diff --git a/qcsrc/server/monsters/monster/shalrath.qc b/qcsrc/server/monsters/monster/shalrath.qc
index e8505868b2a3a7f546e2060e94ed297e07ad1922..4806da59572d4bc153432177c76a0c792ba7d1da 100644 (file)
--- a/qcsrc/server/monsters/monster/shalrath.qc
+++ b/qcsrc/server/monsters/monster/shalrath.qc
@@ -321,7 +321,7 @@ void shalrath_heal()
                {
                        if(IS_PLAYER(head))
                        {
-                               if(head.ammo_cells < start_ammo_cells || head.health < g_pickup_healthmedium_max)
+                               if((g_minstagib && head.ammo_cells < start_ammo_cells) || head.health < g_pickup_healthmedium_max)
                                        pointparticles(particleeffectnum(((g_minstagib) ? "ammoregen_fx" : "healing_fx")), head.origin, '0 0 0', 1);
                                if(g_minstagib)
                                        head.ammo_cells = bound(0, head.ammo_cells + 1, start_ammo_cells);