X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fstate.qc;h=d75e08027171aee5cf812333cb56367bb974a3e8;hb=a0244f34e33a974c41eb5464052f152fca91feb6;hp=0d05f195fc41c67722f51238909c3ac076bd2c3e;hpb=6ad6c67d595acf077a7315be008bc795a978c0b7;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/state.qc b/qcsrc/common/state.qc
index 0d05f195f..d75e08027 100644
--- a/qcsrc/common/state.qc
+++ b/qcsrc/common/state.qc
@@ -12,15 +12,17 @@ void PlayerState_attach(entity this)
 
 void PlayerState_detach(entity this)
 {
-	if (!PS(this)) return;  // initial connect
-	FOREACH_CLIENT(PS(it) == PS(this), { PS(it) = NULL; });
-	remove(PS(this));
-	this._ps = NULL;
-
-    Inventory_delete(self);
+    PlayerState ps = PS(this);
+	if (!ps) return;  // initial connect
+	PS(this) = NULL;
+	if (ps.m_client != this) return;  // don't own state, spectator
+	FOREACH_CLIENT(PS(it) == ps, { PS(it) = NULL; });
+	remove(ps);
+
+    Inventory_delete(this);
 }
 
-void GetCvars(int);
+void GetCvars(entity this, int);
 void DecodeLevelParms(entity this);
 void PlayerScore_Attach(entity this);
 void ClientData_Attach(entity this);
@@ -35,7 +37,7 @@ void ClientState_attach(entity this)
 {
 	this._cs = NEW(ClientState, this);
 
-    GetCvars(0);  // get other cvars from player
+    GetCvars(this, 0);  // get other cvars from player
 
 	// TODO: xonstat elo.txt support, until then just 404s
 	if (false && IS_REAL_CLIENT(this)) { PlayerStats_PlayerBasic_CheckUpdate(this); }
@@ -55,7 +57,7 @@ void ClientState_attach(entity this)
 	bot_clientconnect(this);
 }
 
-void bot_clientdisconnect();
+void bot_clientdisconnect(entity this);
 void W_HitPlotClose(entity this);
 void anticheat_report(entity this);
 void playerdemo_shutdown();
@@ -69,9 +71,9 @@ void ClientState_detach(entity this)
 	remove(CS(this));
 	this._cs = NULL;
 
-    GetCvars(-1);  // free cvars
+    GetCvars(this, -1);  // free cvars
 
-    bot_clientdisconnect();
+    bot_clientdisconnect(this);
 
     W_HitPlotClose(this);
     anticheat_report(this);