From 93af4815c927dbdef1fd3529a2bf0c39da33abff Mon Sep 17 00:00:00 2001
From: TimePath <andrew.hardaker1995@gmail.com>
Date: Mon, 26 Oct 2015 17:09:17 +1100
Subject: [PATCH] PutClientInServer: fix regression

---
 qcsrc/server/cl_client.qc | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 4bf002d10a..eb3dfc44e1 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)
-- 
2.39.5