From bd092afdac1b154997e2c429f88d4cc9d2f0255c Mon Sep 17 00:00:00 2001
From: Mario <mario@smbclan.net>
Date: Mon, 8 Aug 2016 13:40:24 +1000
Subject: [PATCH] Only detach playerstate if observer was a player (potential
 fix for player state related issues when switching from spectator to
 observer)

---
 qcsrc/server/cl_client.qc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index c212691db..a37227d03 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -218,7 +218,8 @@ void FixPlayermodel(entity player);
 void PutObserverInServer(entity this)
 {
     bool mutator_returnvalue = MUTATOR_CALLHOOK(MakePlayerObserver, this);
-	PlayerState_detach(this);
+    if(IS_PLAYER(this)) // our own state
+		PlayerState_detach(this);
 
 	if (IS_PLAYER(this) && this.health >= 1) {
         // despawn effect
-- 
2.39.2