From 20a82df9a0b33cd89dd56b83947c558d95bb2047 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Thu, 19 Jan 2017 14:02:32 -0800
Subject: [PATCH] Fix scripts not reloading in certain edge cases

---
 .../src/scripts/EntityScriptServer.cpp              | 13 ++++---------
 libraries/entities/src/EntityItem.h                 |  4 ----
 libraries/script-engine/src/ScriptEngine.cpp        |  7 +++++++
 libraries/script-engine/src/ScriptEngine.h          |  1 +
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/assignment-client/src/scripts/EntityScriptServer.cpp b/assignment-client/src/scripts/EntityScriptServer.cpp
index 02a348df37..579cd8ced6 100644
--- a/assignment-client/src/scripts/EntityScriptServer.cpp
+++ b/assignment-client/src/scripts/EntityScriptServer.cpp
@@ -216,12 +216,6 @@ void EntityScriptServer::resetEntitiesScriptEngine() {
     auto webSocketServerConstructorValue = newEngine->newFunction(WebSocketServerClass::constructor);
     newEngine->globalObject().setProperty("WebSocketServer", webSocketServerConstructorValue);
 
-
-//    newEngine->setEmitScriptUpdatesFunction([this]() {
-//        SharedNodePointer entityServerNode = DependencyManager::get<NodeList>()->soloNodeOfType(NodeType::EntityServer);
-//        return !entityServerNode || isPhysicsEnabled();
-//    });
-
     newEngine->registerGlobalObject("AvatarList", DependencyManager::get<AvatarHashMap>().data());
     newEngine->registerGlobalObject("SoundCache", DependencyManager::get<SoundCache>().data());
 
@@ -287,14 +281,15 @@ void EntityScriptServer::entityServerScriptChanging(const EntityItemID& entityID
 }
 
 void EntityScriptServer::checkAndCallPreload(const EntityItemID& entityID, const bool reload) {
-    if (_entityViewer.getTree() && !_shuttingDown) {
+    if (_entityViewer.getTree() && !_shuttingDown && _entitiesScriptEngine) {
+        auto details = _entitiesScriptEngine->getEntityScriptDetails(entityID);
+
         EntityItemPointer entity = _entityViewer.getTree()->findEntityByEntityItemID(entityID);
-        if (entity && entity->shouldPreloadServerScript() && _entitiesScriptEngine) {
+        if (entity && (details.scriptText != entity->getServerScripts() || reload)) {
             QString scriptUrl = entity->getServerScripts();
             scriptUrl = ResourceManager::normalizeURL(scriptUrl);
             qDebug() << "Loading entity server script" << scriptUrl << "for" << entityID;
             ScriptEngine::loadEntityScript(_entitiesScriptEngine, entityID, scriptUrl, reload);
-            entity->serverScriptHasPreloaded();
         }
     }
 }
diff --git a/libraries/entities/src/EntityItem.h b/libraries/entities/src/EntityItem.h
index d4b62e74de..cb696dd91d 100644
--- a/libraries/entities/src/EntityItem.h
+++ b/libraries/entities/src/EntityItem.h
@@ -444,9 +444,6 @@ public:
                                               ((_loadedScript != _script) || (_loadedScriptTimestamp != _scriptTimestamp)); }
     void scriptHasPreloaded() { _loadedScript = _script; _loadedScriptTimestamp = _scriptTimestamp; }
 
-    bool shouldPreloadServerScript() const { return !_serverScripts.isEmpty() && ((_loadedServerScripts != _serverScripts)); }
-    void serverScriptHasPreloaded() { _loadedServerScripts = _serverScripts; }
-
     bool getClientOnly() const { return _clientOnly; }
     void setClientOnly(bool clientOnly) { _clientOnly = clientOnly; }
     // if this entity is client-only, which avatar is it associated with?
@@ -519,7 +516,6 @@ protected:
     QString _loadedScript; /// the value of _script when the last preload signal was sent
     quint64 _scriptTimestamp{ ENTITY_ITEM_DEFAULT_SCRIPT_TIMESTAMP }; /// the script loaded property used for forced reload
     QString _serverScripts;
-    QString _loadedServerScripts;
 
     /// the value of _scriptTimestamp when the last preload signal was sent
     // NOTE: on construction we want this to be different from _scriptTimestamp so we intentionally bump it
diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index cedf5a4ed8..5cbd5c2739 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -1587,6 +1587,13 @@ 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 e266ff3bc9..bdf542905a 100644
--- a/libraries/script-engine/src/ScriptEngine.h
+++ b/libraries/script-engine/src/ScriptEngine.h
@@ -149,6 +149,7 @@ 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(); }