Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix style error, start lifetime properly for cloned entities

Browse source
This commit is contained in:
Livi Erickson 2018-05-20 16:41:14 -07:00
parent 6c8d68afc6
commit 9c0084209b
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/entities/src/EntityItemProperties.cpp
View file

@ -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);

1
libraries/entities/src/EntityTree.cpp
View file

@ -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: