diff --git a/assignment-client/src/scripts/EntityScriptServer.cpp b/assignment-client/src/scripts/EntityScriptServer.cpp index 579cd8ced6..6da935d0db 100644 --- a/assignment-client/src/scripts/EntityScriptServer.cpp +++ b/assignment-client/src/scripts/EntityScriptServer.cpp @@ -281,8 +281,9 @@ void EntityScriptServer::entityServerScriptChanging(const EntityItemID& entityID } void EntityScriptServer::checkAndCallPreload(const EntityItemID& entityID, const bool reload) { - if (_entityViewer.getTree() && !_shuttingDown && _entitiesScriptEngine) { - auto details = _entitiesScriptEngine->getEntityScriptDetails(entityID); + EntityScriptDetails details; + if (_entityViewer.getTree() && !_shuttingDown && _entitiesScriptEngine && + _entitiesScriptEngine->getEntityScriptDetails(entityID, details)) { EntityItemPointer entity = _entityViewer.getTree()->findEntityByEntityItemID(entityID); if (entity && (details.scriptText != entity->getServerScripts() || reload)) { diff --git a/libraries/networking/src/EntityScriptClient.h b/libraries/networking/src/EntityScriptClient.h index f32d78a6dd..d331b8ca31 100644 --- a/libraries/networking/src/EntityScriptClient.h +++ b/libraries/networking/src/EntityScriptClient.h @@ -73,4 +73,4 @@ private: void forceFailureOfPendingRequests(SharedNodePointer node); }; -#endif \ No newline at end of file +#endif diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp index 5cbd5c2739..cedf5a4ed8 100644 --- a/libraries/script-engine/src/ScriptEngine.cpp +++ b/libraries/script-engine/src/ScriptEngine.cpp @@ -1587,13 +1587,6 @@ void ScriptEngine::unloadAllEntityScripts() { #endif // DEBUG_ENGINE_STATE } -EntityScriptDetails ScriptEngine::getEntityScriptDetails(const EntityItemID& entityID) const { - if (_entityScripts.contains(entityID)) { - return _entityScripts[entityID]; - } - return EntityScriptDetails(); -} - void ScriptEngine::refreshFileScript(const EntityItemID& entityID) { if (!_entityScripts.contains(entityID)) { return; diff --git a/libraries/script-engine/src/ScriptEngine.h b/libraries/script-engine/src/ScriptEngine.h index bdf542905a..e266ff3bc9 100644 --- a/libraries/script-engine/src/ScriptEngine.h +++ b/libraries/script-engine/src/ScriptEngine.h @@ -149,7 +149,6 @@ public: const QStringList& params = QStringList()) override; Q_INVOKABLE void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const PointerEvent& event); Q_INVOKABLE void callEntityScriptMethod(const EntityItemID& entityID, const QString& methodName, const EntityItemID& otherID, const Collision& collision); - Q_INVOKABLE EntityScriptDetails getEntityScriptDetails(const EntityItemID& entityID) const; Q_INVOKABLE void requestGarbageCollection() { collectGarbage(); }