From f189edde227e7b0e660ab96182b08fa3146a63e7 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Wed, 21 Dec 2016 19:39:14 +0000 Subject: [PATCH 1/2] return status on this function --- .../src/shared/ScriptMethodsObjectInfo.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp index 3a78cfce..976c1557 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp @@ -160,7 +160,7 @@ namespace ScriptMethodsObjectInfoNamespace jboolean JNICALL hasCondition(JNIEnv *env, jobject self, jlong target, jint condition); jboolean JNICALL setCondition(JNIEnv *env, jobject self, jlong target, jint condition); jboolean JNICALL clearCondition(JNIEnv *env, jobject self, jlong target, jint condition); - void JNICALL sendScriptVarsToProxies(JNIEnv * env, jobject self, jlong obj, jbyteArray buffer); + jboolean JNICALL sendScriptVarsToProxies(JNIEnv * env, jobject self, jlong obj, jbyteArray buffer); jstring JNICALL getAppearance(JNIEnv * env, jobject self, jlong target); jboolean JNICALL isInsured(JNIEnv * env, jobject self, jlong target); jboolean JNICALL isAutoInsured(JNIEnv * env, jobject self, jlong target); @@ -512,7 +512,7 @@ const JNINativeMethod NATIVES[] = { JF("getCtsDestinationClusters", "()[Ljava/lang/String;", getCtsDestinationClusters), JF("getCurrentSceneName", "()Ljava/lang/String;", getCurrentSceneName), JF("getClusterName", "()Ljava/lang/String;", getClusterName), - JF("_sendScriptVarsToProxies", "(J[B)V", sendScriptVarsToProxies), + JF("_sendScriptVarsToProxies", "(J[B)Z", sendScriptVarsToProxies), JF("_canEquipWearable", "(JJ)Z", canEquipWearable), JF("_openCustomizationWindow", "(JJLjava/lang/String;IILjava/lang/String;IILjava/lang/String;IILjava/lang/String;II)V", openCustomizationWindow), JF("_getHologramType", "(J)I", getHologramType), @@ -3363,10 +3363,12 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::canEquipWearable(JNIEnv * env //----------------------------------------------------------------------- -void JNICALL ScriptMethodsObjectInfoNamespace::sendScriptVarsToProxies(JNIEnv * env, jobject self, jlong obj, jbyteArray buffer) +jboolean JNICALL ScriptMethodsObjectInfoNamespace::sendScriptVarsToProxies(JNIEnv * env, jobject self, jlong obj, jbyteArray buffer) { PROFILER_AUTO_BLOCK_DEFINE("JNI::sendScriptVarsToProxies"); + jboolean res = JNI_FALSE; + ServerObject * object = 0; if (obj != 0 && buffer != 0) { @@ -3400,11 +3402,15 @@ void JNICALL ScriptMethodsObjectInfoNamespace::sendScriptVarsToProxies(JNIEnv * ServerMessageForwarding::send(deltasMessage); ServerMessageForwarding::end(); + + res = JNI_TRUE; } } } } } + + return res; } //----------------------------------------------------------------------- From 5009441d4dff20e05fe34d6013ef2087cd877a87 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Wed, 21 Dec 2016 19:48:51 +0000 Subject: [PATCH 2/2] maybe this is the culprit --- .../serverScript/src/shared/ScriptMethodsObjectInfo.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp b/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp index 976c1557..4729641f 100755 --- a/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp +++ b/engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp @@ -3389,10 +3389,10 @@ jboolean JNICALL ScriptMethodsObjectInfoNamespace::sendScriptVarsToProxies(JNIEn uint32 const myProcessId = GameServer::getInstance().getProcessId(); uint32 const authProcessId = object->getAuthServerProcessId(); - ProxyList syncServers(proxyList); + ProxyList syncServers; //(proxyList); if (myProcessId != authProcessId) { - syncServers.erase(myProcessId); + //syncServers.erase(myProcessId); syncServers.insert(authProcessId); }