From a1885926b57f8071c255bd8b605072e54c781435 Mon Sep 17 00:00:00 2001
From: ZappoMan <brad@highfidelity.io>
Date: Tue, 24 Oct 2017 11:46:42 -0700
Subject: [PATCH] some cleanup

---
 assignment-client/src/scripts/EntityScriptServer.cpp | 4 ++--
 libraries/entities/src/EntityScriptingInterface.cpp  | 9 ++++++++-
 libraries/networking/src/EntityScriptClient.cpp      | 5 +----
 libraries/networking/src/EntityScriptClient.h        | 2 +-
 libraries/script-engine/src/ScriptEngine.cpp         | 2 --
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/assignment-client/src/scripts/EntityScriptServer.cpp b/assignment-client/src/scripts/EntityScriptServer.cpp
index d627b019ef..8f4ce65579 100644
--- a/assignment-client/src/scripts/EntityScriptServer.cpp
+++ b/assignment-client/src/scripts/EntityScriptServer.cpp
@@ -30,7 +30,7 @@
 #include <UUID.h>
 #include <WebSocketServerClass.h>
 
-#include <EntityScriptClient.h> // for EntityScriptServerStub
+#include <EntityScriptClient.h> // for EntityScriptServerServices
 
 #include "EntityScriptServerLogging.h"
 #include "../entities/AssignmentParentFinder.h"
@@ -70,7 +70,7 @@ EntityScriptServer::EntityScriptServer(ReceivedMessage& message) : ThreadedAssig
     DependencyManager::set<ScriptCache>();
     DependencyManager::set<ScriptEngines>(ScriptEngine::ENTITY_SERVER_SCRIPT);
 
-    DependencyManager::set<EntityScriptServerStub>();
+    DependencyManager::set<EntityScriptServerServices>();
 
 
     // Needed to ensure the creation of the DebugDraw instance on the main thread
diff --git a/libraries/entities/src/EntityScriptingInterface.cpp b/libraries/entities/src/EntityScriptingInterface.cpp
index 4e556c83a3..d34c1e923f 100644
--- a/libraries/entities/src/EntityScriptingInterface.cpp
+++ b/libraries/entities/src/EntityScriptingInterface.cpp
@@ -577,7 +577,14 @@ void EntityScriptingInterface::callEntityServerMethod(QUuid id, const QString& m
 
 void EntityScriptingInterface::callEntityClientMethod(QUuid clientSessionID, QUuid entityID, const QString& method, const QStringList& params) {
     PROFILE_RANGE(script_entities, __FUNCTION__);
-    DependencyManager::get<EntityScriptServerStub>()->callEntityClientMethod(clientSessionID, entityID, method, params);
+    auto scriptServerServices = DependencyManager::get<EntityScriptServerServices>();
+
+    // this won't be available on clients
+    if (scriptServerServices) {
+        scriptServerServices->callEntityClientMethod(clientSessionID, entityID, method, params);
+    } else {
+        qWarning() << "Entities.callEntityClientMethod() not allowed in client";
+    }
 }
 
 
diff --git a/libraries/networking/src/EntityScriptClient.cpp b/libraries/networking/src/EntityScriptClient.cpp
index b3a6a1b59d..75ae7369fb 100644
--- a/libraries/networking/src/EntityScriptClient.cpp
+++ b/libraries/networking/src/EntityScriptClient.cpp
@@ -92,10 +92,7 @@ void EntityScriptClient::callEntityServerMethod(QUuid entityID, const QString& m
     }
 }
 
-void EntityScriptServerStub::callEntityClientMethod(QUuid clientSessionID, QUuid entityID, const QString& method, const QStringList& params) {
-    qDebug() << __FUNCTION__;
-
-
+void EntityScriptServerServices::callEntityClientMethod(QUuid clientSessionID, QUuid entityID, const QString& method, const QStringList& params) {
     // only valid to call this function if you are the entity script server
     auto nodeList = DependencyManager::get<NodeList>();
     SharedNodePointer targetClient = nodeList->nodeWithUUID(clientSessionID);
diff --git a/libraries/networking/src/EntityScriptClient.h b/libraries/networking/src/EntityScriptClient.h
index 43e89611da..4cfb03dca7 100644
--- a/libraries/networking/src/EntityScriptClient.h
+++ b/libraries/networking/src/EntityScriptClient.h
@@ -75,7 +75,7 @@ private:
 };
 
 
-class EntityScriptServerStub : public QObject, public Dependency {
+class EntityScriptServerServices : public QObject, public Dependency {
     Q_OBJECT
 public:
     void callEntityClientMethod(QUuid clientSessionID, QUuid entityID, const QString& method, const QStringList& params);
diff --git a/libraries/script-engine/src/ScriptEngine.cpp b/libraries/script-engine/src/ScriptEngine.cpp
index 92aab79219..4ef4180447 100644
--- a/libraries/script-engine/src/ScriptEngine.cpp
+++ b/libraries/script-engine/src/ScriptEngine.cpp
@@ -2510,8 +2510,6 @@ void ScriptEngine::callEntityScriptMethod(const EntityItemID& entityID, const QS
         if (remoteCallerID == QUuid()) {
             callAllowed = true;
         } else {
-            qDebug() << __FUNCTION__ << "checking remotelyCallable method: " << methodName << " on entityID:" << entityID;
-
             if (entityScript.property("remotelyCallable").isArray()) {
                 auto callables = entityScript.property("remotelyCallable");
                 auto callableCount = callables.property("length").toInteger();