Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-20 04:44:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove AvatarHashMap from EntityServer

Browse source
This commit is contained in:
Ryan Huffman 2017-01-20 11:43:53 -08:00
parent 2ca50153b3
commit 8a691e8340
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
assignment-client/src/entities/AssignmentParentFinder.cpp
View file

@ -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;

2
assignment-client/src/entities/EntityServer.cpp
View file

@ -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);