flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Merge pull request #3160 from LogicParrot/clientHandleThread

Browse Source 
ClientHandle destruction thread safety
This commit is contained in:
LogicParrot 2016-04-23 11:41:52 +03:00
commit eb8e932540
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ClientHandle.cpp
View File

@ -174,7 +174,7 @@ void cClientHandle::Destroy(void)
cWorld * World = m_Player->GetWorld(); cWorld * World = m_Player->GetWorld();
if (World != nullptr) if (World != nullptr)
{ {
World->RemovePlayer(m_Player, true); // TODO this is NOT thread safe. World->RemovePlayer(m_Player, true);
} }
m_Player->RemoveClientHandle(); m_Player->RemoveClientHandle();
} }
@ -3082,7 +3082,18 @@ void cClientHandle::SocketClosed(void)
LOGD("Client %s @ %s disconnected", m_Username.c_str(), m_IPString.c_str()); LOGD("Client %s @ %s disconnected", m_Username.c_str(), m_IPString.c_str());
cRoot::Get()->GetPluginManager()->CallHookDisconnect(*this, "Player disconnected"); cRoot::Get()->GetPluginManager()->CallHookDisconnect(*this, "Player disconnected");
} }
Destroy(); if (m_Player != nullptr)
{
m_Player->GetWorld()->ScheduleTask(1, [this](cWorld & World)
{
UNUSED(World);
Destroy();
});
}
else
{
Destroy();
}
} }