From b00435074e73eee66254b0646208ee5816b2cd9b Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Thu, 19 Jan 2017 12:00:24 -0800
Subject: [PATCH] stop script engine when entity server goes away

---
 assignment-client/src/scripts/EntityScriptServer.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/assignment-client/src/scripts/EntityScriptServer.cpp b/assignment-client/src/scripts/EntityScriptServer.cpp
index b2daabbd6c..55e0973094 100644
--- a/assignment-client/src/scripts/EntityScriptServer.cpp
+++ b/assignment-client/src/scripts/EntityScriptServer.cpp
@@ -297,7 +297,11 @@ void EntityScriptServer::checkAndCallPreload(const EntityItemID& entityID, const
 
 void EntityScriptServer::nodeKilled(SharedNodePointer killedNode) {
     if (killedNode->getType() == NodeType::EntityServer) {
-        _entitiesScriptEngine->unloadAllEntityScripts();
+        if (_entitiesScriptEngine) {
+            _entitiesScriptEngine->unloadAllEntityScripts();
+            _entitiesScriptEngine->stop();
+        }
+
         resetEntitiesScriptEngine();
     }
 }