Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 08:24:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

beware null sessionID

Browse source
This commit is contained in:
Andrew Meadows 2019-09-19 08:25:01 -07:00
parent e7001c3f1b
commit ab419ddd23
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -481,11 +481,15 @@ QUuid EntityScriptingInterface::addEntityInternal(const EntityItemProperties& pr
_activityTracking.addedEntityCount++; _activityTracking.addedEntityCount++;
auto nodeList = DependencyManager::get<NodeList>(); auto nodeList = DependencyManager::get<NodeList>();
const auto sessionID = nodeList->getSessionUUID(); auto sessionID = nodeList->getSessionUUID();
EntityItemProperties propertiesWithSimID = properties; EntityItemProperties propertiesWithSimID = properties;
propertiesWithSimID.setEntityHostType(entityHostType); propertiesWithSimID.setEntityHostType(entityHostType);
if (entityHostType == entity::HostType::AVATAR) { if (entityHostType == entity::HostType::AVATAR) {
if (sessionID.isNull()) {
// null sessionID is unacceptable in this case
sessionID = AVATAR_SELF_ID;
}
propertiesWithSimID.setOwningAvatarID(sessionID); propertiesWithSimID.setOwningAvatarID(sessionID);
} else if (entityHostType == entity::HostType::LOCAL) { } else if (entityHostType == entity::HostType::LOCAL) {
// For now, local entities are always collisionless // For now, local entities are always collisionless
@ -801,7 +805,7 @@ QUuid EntityScriptingInterface::editEntity(const QUuid& id, const EntityItemProp
return; return;
} }
if (entity->isAvatarEntity() && entity->getOwningAvatarID() != sessionID) { if (entity->isAvatarEntity() && entity->getOwningAvatarID() != sessionID && entity->getOwningAvatarID() != AVATAR_SELF_ID) {
// don't edit other avatar's avatarEntities // don't edit other avatar's avatarEntities
properties = EntityItemProperties(); properties = EntityItemProperties();
return; return;