swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-07-28 23:16:15 -04:00
Code Issues Projects Releases Wiki Activity

this proxy list sometimes went out of scope before copied, fix it so we don't bug any more toons!

Browse Source
This commit is contained in:
DarthArgus
2016-12-16 21:26:36 +00:00
parent 7e0b9fb26d
commit 7e2d3377ed
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverScript/src/shared/ScriptMethodsObjectInfo.cpp
+16 -16
View File
@@ -3367,38 +3367,38 @@ void JNICALL ScriptMethodsObjectInfoNamespace::sendScriptVarsToProxies(JNIEnv *
{
PROFILER_AUTO_BLOCK_DEFINE("JNI::sendScriptVarsToProxies");
ServerObject * object = 0;
if (obj != 0 && buffer != 0)
{
if (JavaLibrary::getObject(obj, object))
ServerObject *object = nullptr;
if (JavaLibrary::getObject(obj, object) && object != nullptr)
{
ProxyList const &proxyList = object->getExposedProxyList();
ProxyList proxyList(object->getExposedProxyList());
if (!proxyList.empty())
{
std::vector<int8> data;
if (ScriptConversion::convert(buffer, data))
{
if(data.size() > 0)
std::vector<int8> data;
if (ScriptConversion::convert(buffer, data))
{
WARNING(data.size() > 60000, ("JavaLibrary::sendScriptVarsToProxies: "
"Packing scriptvars for object %s, packed data size = %d",
if(data.size() > 0)
{
WARNING(data.size() > 60000, ("JavaLibrary::sendScriptVarsToProxies: "
"Packing scriptvars for object %s, packed data size = %d",
object->getNetworkId().getValueString().c_str(),
static_cast<int>(data.size())));
uint32 const myProcessId = GameServer::getInstance().getProcessId();
uint32 const authProcessId = object->getAuthServerProcessId();
ProxyList syncServers(proxyList);
if (myProcessId != authProcessId)
{
syncServers.erase(myProcessId);
syncServers.insert(authProcessId);
proxyList.erase(myProcessId);
proxyList.insert(authProcessId);
}
ServerMessageForwarding::begin(std::vector<uint32>(syncServers.begin(), syncServers.end()));
ServerMessageForwarding::begin(std::vector<uint32>(proxyList.begin(), proxyList.end()));
SynchronizeScriptVarDeltasMessage const deltasMessage(object->getNetworkId(), data);
ServerMessageForwarding::send(deltasMessage);
ServerMessageForwarding::end();
}
}