Merge branch 'master' into Mario/monsters

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

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index b1873a4bd63c71665b7d6e924b11846e3004653a..94734f1fe41c183987987bc88bbd91253b16a0eb 100644 (file)
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -268,6 +268,10 @@ float ItemSend(entity to, float sf)
     return TRUE;
 }
 
+void ItemUpdate(entity item)
+{
+       item.SendFlags |= ISF_LOCATION;
+}
 
 float have_pickup_item(void)
 {
@@ -686,6 +690,8 @@ void Item_Touch (void)
                return;
        if (self.owner == other)
                return;
+       if (time < self.wait)
+               return;
 
        switch(MUTATOR_CALLHOOK(ItemTouch))
        {