X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Fstate.qc;h=0f40acfc6856b65ad68446091b5a9142d3d16e13;hp=772dbccbd58d870137b69ab4143fc053e3b02e81;hb=e0012447bfce1b551df3dc01b043655aa93dafad;hpb=338f8f4862627b3ee04cbdd20dc5590973614e01

diff --git a/qcsrc/common/state.qc b/qcsrc/common/state.qc
index 772dbccbd5..0f40acfc68 100644
--- a/qcsrc/common/state.qc
+++ b/qcsrc/common/state.qc
@@ -1,13 +1,16 @@
 #include "state.qh"
 
-void Inventory_new(entity this);
+void Inventory_new(PlayerState this);
 void Inventory_delete(entity this);
 
 void PlayerState_attach(entity this)
 {
+	if (PS(this))
+		return;
+
 	this._ps = NEW(PlayerState, this);
 
-	Inventory_new(this);
+	Inventory_new(PS(this));
 }
 
 void PlayerState_detach(entity this)
@@ -18,11 +21,10 @@ void PlayerState_detach(entity this)
 
 	if (ps.m_client != this) return;  // don't own state, spectator
 	ps.ps_push(ps, this);
+    Inventory_delete(ps);
 
 	FOREACH_CLIENT(PS(it) == ps, { PS(it) = NULL; });
 	delete(ps);
-
-    Inventory_delete(this);
 }
 
 void GetCvars(entity this, entity store, int);
@@ -39,8 +41,6 @@ void ClientState_attach(entity this)
 {
 	this._cs = NEW(ClientState, this);
 
-    GetCvars(this, CS(this), 0);  // get other cvars from player
-
 	// TODO: fold all of these into ClientState
 
 	DecodeLevelParms(this);
@@ -69,12 +69,11 @@ void ClientState_detach(entity this)
     PlayerScore_Detach(this); // what ^they^ said
     W_HitPlotClose(this);
     ClientData_Detach(this);
+    entcs_detach(this);
 	delete(CS(this));
 	this._cs = NULL;
 
-
     bot_clientdisconnect(this);
 
     anticheat_report_to_eventlog(this);
-    entcs_detach(this);
 }