Fix teamchange notifications when notification_show_location is enabled

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

diff --git a/qcsrc/common/state.qc b/qcsrc/common/state.qc
index 651a86f917f5a83ead5c6517070b05bd6be1cd4c..018f626e0318bcf02dee8807f08260afd1262158 100644 (file)
--- a/qcsrc/common/state.qc
+++ b/qcsrc/common/state.qc
@@ -4,8 +4,9 @@
 
 void Inventory_new(PlayerState this);
 void Inventory_delete(entity this);
+void Inventory_clear(PlayerState this);
 void InventoryStorage_attach(PlayerState this);
-void InventoryStorage_detach(PlayerState this);
+void InventoryStorage_delete(PlayerState this);
 
 void PlayerState_attach(entity this)
 {
@@ -22,6 +23,7 @@ void PlayerState_detach(entity this)
     PlayerState ps = PS(this);
        if (!ps) return;  // initial connect
        PS(this) = NULL;
+    Inventory_clear(this.inventory_store); // no need to network updates, as there is no inventory attached
 
        if (ps.m_client != this) return;  // don't own state, spectator
        ps.ps_push(ps, this);
@@ -74,7 +76,7 @@ void ClientState_detach(entity this)
     W_HitPlotClose(this);
     ClientData_Detach(this);
     entcs_detach(this);
-    InventoryStorage_detach(this);
+    InventoryStorage_delete(this);
        delete(CS(this));
        this._cs = NULL;