From: terencehill <piuntn@gmail.com>
Date: Tue, 13 Sep 2016 19:42:31 +0000 (+0200)
Subject: Fix observers/spectators not blocked and missing CSQCMODEL_AUTOUPDATE
X-Git-Tag: xonotic-v0.8.2~389^2~9
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=25570b9609d8f791324e86b659b53b8fcf18b193;p=xonotic%2Fxonotic-data.pk3dir.git

Fix observers/spectators not blocked and missing CSQCMODEL_AUTOUPDATE
---

diff --git a/qcsrc/server/client.qc b/qcsrc/server/client.qc
index 8120cfd20..2963abf87 100644
--- 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 39eeeb4f5..f6eaace3d 100644
--- 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);