Merge branch 'master' into terencehill/itemstime

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / cl_client.qc

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index d34a0c28756c05e966a1ff986dd41dc54b43addc..bcba20cc1b023e01ed1089a43872cbdc17ede50e 100644 (file)
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -396,6 +396,7 @@ void PutObserverInServer (void)
 
        if(clienttype(self) == CLIENTTYPE_REAL)
        {
+               Item_GetItemsTime(self);
                msg_entity = self;
                WriteByte(MSG_ONE, SVC_SETVIEW);
                WriteEntity(MSG_ONE, self);
@@ -700,6 +701,8 @@ void PutClientInServer (void)
                        return; // spawn failed
                }
 
+               Item_ClearItemsTime();
+
                RemoveGrapplingHook(self); // Wazat's Grappling Hook
 
                self.classname = "player";