From 8a691e8340b764c8aa088f2e1ea89df034572e32 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Fri, 20 Jan 2017 11:43:53 -0800
Subject: [PATCH] Remove AvatarHashMap from EntityServer

---
 .../src/entities/AssignmentParentFinder.cpp          | 12 +++++++-----
 assignment-client/src/entities/EntityServer.cpp      |  2 --
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/assignment-client/src/entities/AssignmentParentFinder.cpp b/assignment-client/src/entities/AssignmentParentFinder.cpp
index ff167de9cf..b8737bdc63 100644
--- a/assignment-client/src/entities/AssignmentParentFinder.cpp
+++ b/assignment-client/src/entities/AssignmentParentFinder.cpp
@@ -33,11 +33,13 @@ SpatiallyNestableWeakPointer AssignmentParentFinder::find(QUuid parentID, bool&
     }
 
     // search avatars
-    auto avatarHashMap = DependencyManager::get<AvatarHashMap>();
-    parent = avatarHashMap->getAvatarBySessionID(parentID);
-    if (!parent.expired()) {
-        success = true;
-        return parent;
+    if (DependencyManager::isSet<AvatarHashMap>()) {
+        auto avatarHashMap = DependencyManager::get<AvatarHashMap>();
+        parent = avatarHashMap->getAvatarBySessionID(parentID);
+        if (!parent.expired()) {
+            success = true;
+            return parent;
+        }
     }
 
     success = false;
diff --git a/assignment-client/src/entities/EntityServer.cpp b/assignment-client/src/entities/EntityServer.cpp
index 9474047fcb..23eec6197c 100644
--- a/assignment-client/src/entities/EntityServer.cpp
+++ b/assignment-client/src/entities/EntityServer.cpp
@@ -17,7 +17,6 @@
 #include "EntityServerConsts.h"
 #include "EntityNodeData.h"
 #include "AssignmentParentFinder.h"
-#include <AvatarHashMap.h>
 
 const char* MODEL_SERVER_NAME = "Entity";
 const char* MODEL_SERVER_LOGGING_TARGET_NAME = "entity-server";
@@ -63,7 +62,6 @@ OctreePointer EntityServer::createTree() {
         _entitySimulation = simpleSimulation;
     }
 
-    DependencyManager::set<AvatarHashMap>();
     DependencyManager::registerInheritance<SpatialParentFinder, AssignmentParentFinder>();
     DependencyManager::set<AssignmentParentFinder>(tree);