From 9c0084209b51fd89a9e9b8728dae418190cbd85f Mon Sep 17 00:00:00 2001
From: Livi Erickson <livi@outlook.com>
Date: Sun, 20 May 2018 16:41:14 -0700
Subject: [PATCH] fix style error, start lifetime properly for cloned entities

---
 libraries/entities/src/EntityItemProperties.cpp | 2 ++
 libraries/entities/src/EntityTree.cpp           | 1 +
 2 files changed, 3 insertions(+)

diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 39449c7cd1..8dc9e94096 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -3657,6 +3657,8 @@ void EntityItemProperties::convertToCloneProperties(const EntityItemID& entityID
     setLifetime(getCloneLifetime());
     setDynamic(getCloneDynamic());
     setClientOnly(getCloneAvatarEntity());
+    setCreated(usecTimestampNow());
+    setLastEdited(usecTimestampNow());
     setCloneable(ENTITY_ITEM_DEFAULT_CLONEABLE);
     setCloneLifetime(ENTITY_ITEM_DEFAULT_CLONE_LIFETIME);
     setCloneLimit(ENTITY_ITEM_DEFAULT_CLONE_LIMIT);
diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index b698ac6eb8..52e8fe164b 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -1429,6 +1429,7 @@ int EntityTree::processEditPacketData(ReceivedMessage& message, const unsigned c
         case PacketType::EntityClone:
             isClone = true; // fall through to next case
         case PacketType::EntityAdd:
+            // FALLTHRU
             isAdd = true;  // fall through to next case
             // FALLTHRU
         case PacketType::EntityPhysics: