From bed2ea052df8dbe4f08b501dd0646b0eeb905d7a Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Tue, 30 Jan 2018 09:44:49 -0800
Subject: [PATCH] better solution

---
 libraries/entities/src/EntityTree.cpp | 18 +++---------------
 libraries/entities/src/EntityTree.h   |  2 --
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp
index 8dad126d30..f485f4121e 100644
--- a/libraries/entities/src/EntityTree.cpp
+++ b/libraries/entities/src/EntityTree.cpp
@@ -65,7 +65,7 @@ public:
 
 
 EntityTree::EntityTree(bool shouldReaverage) :
-    Octree(shouldReaverage)
+    Octree(shouldReaverage), _needsParentFixupLock(QReadWriteLock::Recursive)
 {
     resetClientEditStats();
 
@@ -1679,23 +1679,13 @@ void EntityTree::entityChanged(EntityItemPointer entity) {
     }
 }
 
-QVector<EntityItemWeakPointer> EntityTree::getEntitiesParentFixup() const {
-    QReadLocker locker(&_needsParentFixupLock);
-    return _needsParentFixup;
-}
-
-void EntityTree::setNeedsParentFixup(QVector<EntityItemWeakPointer> entitiesFixup) {
-    QWriteLocker locker(&_needsParentFixupLock);
-    _needsParentFixup = entitiesFixup;
-}
-
 void EntityTree::fixupNeedsParentFixups() {
     PROFILE_RANGE(simulation_physics, "FixupParents");
     MovingEntitiesOperator moveOperator;
 
-    QVector<EntityItemWeakPointer> entitiesParentFixup = getEntitiesParentFixup();
+    QWriteLocker locker(&_needsParentFixupLock);
 
-    QMutableVectorIterator<EntityItemWeakPointer> iter(entitiesParentFixup);
+    QMutableVectorIterator<EntityItemWeakPointer> iter(_needsParentFixup);
     while (iter.hasNext()) {
         EntityItemWeakPointer entityWP = iter.next();
         EntityItemPointer entity = entityWP.lock();
@@ -1758,8 +1748,6 @@ void EntityTree::fixupNeedsParentFixups() {
         PerformanceTimer perfTimer("recurseTreeWithOperator");
         recurseTreeWithOperator(&moveOperator);
     }
-
-    setNeedsParentFixup(entitiesParentFixup);
 }
 
 void EntityTree::deleteDescendantsOfAvatar(QUuid avatarID) {
diff --git a/libraries/entities/src/EntityTree.h b/libraries/entities/src/EntityTree.h
index f4ff7ad118..8cb89d6493 100644
--- a/libraries/entities/src/EntityTree.h
+++ b/libraries/entities/src/EntityTree.h
@@ -385,8 +385,6 @@ private:
     void sendChallengeOwnershipPacket(const QString& certID, const QString& ownerKey, const EntityItemID& entityItemID, const SharedNodePointer& senderNode);
     void sendChallengeOwnershipRequestPacket(const QByteArray& certID, const QByteArray& text, const QByteArray& nodeToChallenge, const SharedNodePointer& senderNode);
     void validatePop(const QString& certID, const EntityItemID& entityItemID, const SharedNodePointer& senderNode, bool isRetryingValidation);
-    QVector<EntityItemWeakPointer> getEntitiesParentFixup() const;
-    void setNeedsParentFixup(QVector<EntityItemWeakPointer> entitiesFixup);
 
     std::shared_ptr<AvatarData> _myAvatar{ nullptr };
 };