Showing the changes to assignment-client/src/scripts/EntityScriptServer.cpp (1 of 2 files). Show all
Unified · Split
| @@ -86,8 +86,6 @@ EntityScriptServer::EntityScriptServer(ReceivedMessage& message) : ThreadedAssig · 85 unmodified lines | ||
| 86 | 86 | this, "handleOctreePacket"); |
| 87 | 87 | packetReceiver.registerListener(PacketType::SelectedAudioFormat, this, "handleSelectedAudioFormat"); |
| 88 | 88 | |
| 89 | − auto avatarHashMap = DependencyManager::set<AvatarHashMap>(); | |
| 90 | − | |
| 91 | 89 | packetReceiver.registerListener(PacketType::ReloadEntityServerScript, this, "handleReloadEntityServerScriptPacket"); |
| 92 | 90 | packetReceiver.registerListener(PacketType::EntityScriptGetStatus, this, "handleEntityScriptGetStatusPacket"); |
| 93 | 91 | packetReceiver.registerListener(PacketType::EntityServerScriptLog, this, "handleEntityServerScriptLogPacket"); |
| @@ -255,6 +253,7 @@ void EntityScriptServer::handleEntityScriptCallMethodPacket(QSharedPointer<Recei · 161 unmodified lines | ||
| 255 | 253 | void EntityScriptServer::run() { |
| 256 | 254 | DependencyManager::set<ScriptEngines>(ScriptEngine::ENTITY_SERVER_SCRIPT); |
| 257 | 255 | DependencyManager::set<EntityScriptServerServices>(); |
| 256 | + DependencyManager::set<AvatarHashMap>(); | |
| 258 | 257 | |
| 259 | 258 | // make sure we request our script once the agent connects to the domain |
| 260 | 259 | auto nodeList = DependencyManager::get<NodeList>(); |
| @@ -448,6 +447,7 @@ void EntityScriptServer::resetEntitiesScriptEngine() { · 187 unmodified lines | ||
| 448 | 447 | newEngine->globalObject().setProperty("WebSocketServer", webSocketServerConstructorValue); |
| 449 | 448 | |
| 450 | 449 | newEngine->registerGlobalObject("SoundCache", DependencyManager::get<SoundCacheScriptingInterface>().data()); |
| 450 | + newEngine->registerGlobalObject("AvatarList", DependencyManager::get<AvatarHashMap>().data()); | |
| 451 | 451 | |
| 452 | 452 | // connect this script engines printedMessage signal to the global ScriptEngines these various messages |
| 453 | 453 | auto scriptEngines = DependencyManager::get<ScriptEngines>().data(); |