1 files changed, 7 insertions, 2 deletions
diff --git a/source/game/StarItemDrop.cpp b/source/game/StarItemDrop.cpp
index 289de55..4bf41e5 100644
--- a/source/game/StarItemDrop.cpp
+++ b/source/game/StarItemDrop.cpp
@@ -240,8 +240,13 @@ void ItemDrop::update(float dt, uint64_t) {
       Root::singleton().itemDatabase()->loadItem(m_itemDescriptor.get(), m_item);
     m_netGroup.tickNetInterpolation(GlobalTimestep);
     if (m_owningEntity.get() != NullEntityId) {
-      updateTaken(false);
-      m_movementController.tickMaster(dt);
+      m_dropAge.update(world()->epochTime());
+      if (!isMaster() && m_dropAge.elapsedTime() > 1.0f)
+        m_owningEntity.set(NullEntityId);
+      else {
+        updateTaken(false);
+        m_movementController.tickMaster(dt);
+      }
     }
     else {
       m_movementController.tickSlave(dt);