Fix observers/spectators not blocked and missing CSQCMODEL_AUTOUPDATE

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 8120cfd208dcb9de3d3d86f1e16d8907ec1ed480..2963abf8719ae6bc7258d1a78b1c7b5f5fb13196 100644 (file)
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@ -2302,12 +2302,6 @@ void PlayerPreThink (entity this)
                CheckRules_Player(this);
 
                if (gameover || intermission_running) {
-                       if(gameover)
-                       {
-                               this.solid = SOLID_NOT;
-                               this.takedamage = DAMAGE_NO;
-                               set_movetype(this, MOVETYPE_NONE);
-                       }
                        if(intermission_running)
                                IntermissionThink(this);
                        return;
@@ -2604,6 +2598,13 @@ void PlayerPostThink (entity this)
        CheatFrame(this);
 
        //CheckPlayerJump();
+       if (gameover)
+       {
+               this.solid = SOLID_NOT;
+               this.takedamage = DAMAGE_NO;
+               set_movetype(this, MOVETYPE_NONE);
+               CSQCMODEL_AUTOUPDATE(this);
+       }
 
        if (IS_PLAYER(this)) {
                DrownPlayer(this);

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index 39eeeb4f51503f626c768a67afe10766e6409ea1..f6eaace3de622e8916b47d783c26603b02938ea4 100644 (file)
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -1297,7 +1297,6 @@ When the player presses attack or jump, change to the next level
 void IntermissionThink(entity this)
 {
        FixIntermissionClient(this);
-       CSQCMODEL_AUTOUPDATE(this); // PlayerPostThink returns before calling this during intermission, so run it here
 
        float server_screenshot = (autocvar_sv_autoscreenshot && this.cvar_cl_autoscreenshot);
        float client_screenshot = (this.cvar_cl_autoscreenshot == 2);