From: TimePath <andrew.hardaker1995@gmail.com>
Date: Mon, 26 Oct 2015 06:09:17 +0000 (+1100)
Subject: PutClientInServer: fix regression
X-Git-Tag: xonotic-v0.8.2~1788
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=93af4815c927dbdef1fd3529a2bf0c39da33abff;p=xonotic%2Fxonotic-data.pk3dir.git

PutClientInServer: fix regression
---

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 4bf002d10..eb3dfc44e 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -414,6 +414,9 @@ void PutClientInServer()
 		WriteByte(MSG_ONE, SVC_SETVIEW);
 		WriteEntity(MSG_ONE, this);
 	}
+	if (gameover) {
+		this.classname = STR_OBSERVER;
+	}
 
 	SetSpectatee(this, NULL);
 
@@ -422,14 +425,9 @@ void PutClientInServer()
 
 	MUTATOR_CALLHOOK(PutClientInServer, this);
 
-	if (gameover) {
-		this.classname = STR_OBSERVER;
+	if (IS_OBSERVER(this)) {
 		PutObserverInServer();
-		return;
-	}
-
-	if (IS_PLAYER(this))
-	{
+	} else if (IS_PLAYER(this)) {
 		accuracy_resend(this);
 
 		if (this.team < 0)