Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts: src/server/scripts/Commands/cs_debug.cpp src/server/worldserver/worldserver.conf.dist
This commit is contained in:
commit
611d51af98
80 files changed
+2519
-890
No files matched your search
@@ -457,9 +457,15 @@ int WorldSocket::Update (void)
|
||||
if (closing_)
|
||||
return -1;
|
||||
|
||||
if (m_OutActive || (m_OutBuffer->length() == 0 && msg_queue()->is_empty()))
|
||||
if (m_OutActive)
|
||||
return 0;
|
||||
|
||||
{
|
||||
ACE_GUARD_RETURN (LockType, Guard, m_OutBufferLock, 0);
|
||||
if (m_OutBuffer->length() == 0 && msg_queue()->is_empty())
|
||||
return 0;
|
||||
}
|
||||
|
||||
int ret;
|
||||
do
|
||||
ret = handle_output(get_handle());
|
||||
|
||||
Reference in new issue
Block a user