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

Merge pull request #2136 from mc-server/clientDestroyRace

Browse Source 
Fixed ClientHandle not getting properly removed from the world
This commit is contained in:
Mattes D 2015-05-26 17:01:57 +02:00
commit 1e297717e0
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ClientHandle.cpp
View File

@ -2957,13 +2957,20 @@ void cClientHandle::PacketError(UInt32 a_PacketType)
void cClientHandle::SocketClosed(void)
{
// The socket has been closed for any reason
if (!m_Username.empty()) // Ignore client pings
{
LOGD("Client %s @ %s disconnected", m_Username.c_str(), m_IPString.c_str());
cRoot::Get()->GetPluginManager()->CallHookDisconnect(*this, "Player disconnected");
}
if (m_State < csDestroying)
{
cWorld * World = m_Player->GetWorld();
if (World != nullptr)
{
World->RemovePlayer(m_Player, true); // Must be called before cPlayer::Destroy() as otherwise cChunk tries to delete the player, and then we do it again
}
}
Destroy();
}