Merge branch 'master' into Mario/stats_eloranking

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / state.qc

diff --git a/qcsrc/common/state.qc b/qcsrc/common/state.qc
index 2a1168eae017978fe7f56d72004bda716fc49344..0f40acfc6856b65ad68446091b5a9142d3d16e13 100644 (file)
--- a/qcsrc/common/state.qc
+++ b/qcsrc/common/state.qc
@@ -5,6 +5,9 @@ void Inventory_delete(entity this);
 
 void PlayerState_attach(entity this)
 {
+       if (PS(this))
+               return;
+
        this._ps = NEW(PlayerState, this);
 
        Inventory_new(PS(this));
@@ -38,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);