From 1212fefa612f2e9cb0cdf8c2da5d16c9918627de Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Tue, 17 Jan 2017 13:47:19 -0800
Subject: [PATCH] Check for avatar collision in assignment as well

---
 .../src/entities/AssignmentParentFinder.cpp     | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/assignment-client/src/entities/AssignmentParentFinder.cpp b/assignment-client/src/entities/AssignmentParentFinder.cpp
index a0232daff4..ff167de9cf 100644
--- a/assignment-client/src/entities/AssignmentParentFinder.cpp
+++ b/assignment-client/src/entities/AssignmentParentFinder.cpp
@@ -11,6 +11,8 @@
 
 #include "AssignmentParentFinder.h"
 
+#include <AvatarHashMap.h>
+
 SpatiallyNestableWeakPointer AssignmentParentFinder::find(QUuid parentID, bool& success, SpatialParentTree* entityTree) const {
     SpatiallyNestableWeakPointer parent;
 
@@ -25,10 +27,19 @@ SpatiallyNestableWeakPointer AssignmentParentFinder::find(QUuid parentID, bool&
     } else {
         parent = _tree->findEntityByEntityItemID(parentID);
     }
-    if (parent.expired()) {
-        success = false;
-    } else {
+    if (!parent.expired()) {
         success = true;
+        return parent;
     }
+
+    // search avatars
+    auto avatarHashMap = DependencyManager::get<AvatarHashMap>();
+    parent = avatarHashMap->getAvatarBySessionID(parentID);
+    if (!parent.expired()) {
+        success = true;
+        return parent;
+    }
+
+    success = false;
     return parent;
 }