From 872f1b0c64d9dc7479dbc1a9de3615263dc21818 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Tue, 10 May 2016 17:48:55 -0700
Subject: [PATCH] clear avatarEntity data for entities that are deleted

---
 interface/src/avatar/Avatar.cpp                     |  5 ++++-
 interface/src/avatar/MyAvatar.cpp                   |  1 +
 libraries/entities/src/EntityEditPacketSender.cpp   |  6 ++++++
 libraries/entities/src/EntityItem.h                 |  1 +
 libraries/entities/src/EntityScriptingInterface.cpp | 10 +++++++++-
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/interface/src/avatar/Avatar.cpp b/interface/src/avatar/Avatar.cpp
index 83cec224b6..d959b298ef 100644
--- a/interface/src/avatar/Avatar.cpp
+++ b/interface/src/avatar/Avatar.cpp
@@ -229,7 +229,10 @@ void Avatar::updateAvatarEntities() {
             EntityItemPointer entity = entityTree->findEntityByEntityItemID(EntityItemID(entityID));
 
             if (entity) {
-                if (!entityTree->updateEntity(entityID, properties)) {
+                if (entityTree->updateEntity(entityID, properties)) {
+                    entity->markAsChangedOnServer();
+                    entity->updateLastEditedFromRemote();
+                } else {
                     qDebug() << "AVATAR-ENTITES -- updateEntity failed: " << properties.getType();
                     success = false;
                 }
diff --git a/interface/src/avatar/MyAvatar.cpp b/interface/src/avatar/MyAvatar.cpp
index dc0d6d7e97..304aabdcc6 100644
--- a/interface/src/avatar/MyAvatar.cpp
+++ b/interface/src/avatar/MyAvatar.cpp
@@ -828,6 +828,7 @@ void MyAvatar::loadData() {
     for (int i = 0; i < avatarEntityCount; i++) {
         settings.setArrayIndex(i);
         QUuid entityID = settings.value("id").toUuid();
+        // QUuid entityID = QUuid::createUuid(); // generate a new ID
         QByteArray properties = settings.value("properties").toByteArray();
         updateAvatarEntity(entityID, properties);
     }
diff --git a/libraries/entities/src/EntityEditPacketSender.cpp b/libraries/entities/src/EntityEditPacketSender.cpp
index 6cb0b6ef60..28f1871346 100644
--- a/libraries/entities/src/EntityEditPacketSender.cpp
+++ b/libraries/entities/src/EntityEditPacketSender.cpp
@@ -81,6 +81,8 @@ void EntityEditPacketSender::queueEditAvatarEntityMessage(PacketType type,
 
     QByteArray binaryProperties = jsonProperties.toBinaryData();
     _myAvatar->updateAvatarEntity(entityItemID, binaryProperties);
+
+    entity->setLastBroadcast(usecTimestampNow());
     return;
 }
 
@@ -115,6 +117,10 @@ void EntityEditPacketSender::queueEraseEntityMessage(const EntityItemID& entityI
         return; // bail early
     }
 
+    // in case this was a clientOnly entity:
+    assert(_myAvatar);
+    _myAvatar->clearAvatarEntity(entityItemID);
+
     QByteArray bufferOut(NLPacket::maxPayloadSize(PacketType::EntityErase), 0);
 
     if (EntityItemProperties::encodeEraseEntityMessage(entityItemID, bufferOut)) {
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index 4286a9d6ae..c2e497e602 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -375,6 +375,7 @@ public:
     glm::vec3 entityToWorld(const glm::vec3& point) const;
 
     quint64 getLastEditedFromRemote() const { return _lastEditedFromRemote; }
+    void updateLastEditedFromRemote() { _lastEditedFromRemote = usecTimestampNow(); }
 
     void getAllTerseUpdateProperties(EntityItemProperties& properties) const;
 
diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index 3b06c5a998..ade8ade1c4 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -401,6 +401,14 @@ void EntityScriptingInterface::deleteEntity(QUuid id) {
             EntityItemPointer entity = _entityTree->findEntityByEntityItemID(entityID);
             if (entity) {
 
+                auto nodeList = DependencyManager::get<NodeList>();
+                const QUuid myNodeID = nodeList->getSessionUUID();
+                if (entity->getClientOnly() && entity->getOwningAvatarID() != myNodeID) {
+                    // don't delete other avatar's avatarEntities
+                    shouldDelete = false;
+                    return;
+                }
+
                 auto dimensions = entity->getDimensions();
                 float volume = dimensions.x * dimensions.y * dimensions.z;
                 auto density = entity->getDensity();
@@ -806,7 +814,7 @@ bool EntityScriptingInterface::actionWorker(const QUuid& entityID,
             return;
         }
 
-        if (entity->getClientOnly() && entity->getOwningAvatarID() != nodeList->getSessionUUID()) {
+        if (entity->getClientOnly() && entity->getOwningAvatarID() != myNodeID) {
             return;
         }