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

Setting the m_bDestroyed flag only after the cClienthandle is truly destroyed; cClientHandle's destructor now locks loaded chunk lists

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@340 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2012-02-28 14:58:07 +00:00
parent ac117959d3
commit a4503ddb77
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/cClientHandle.cpp
View File

@ -148,8 +148,11 @@ cClientHandle::~cClientHandle()
// Remove from cSocketThreads, we're not to be called anymore: // Remove from cSocketThreads, we're not to be called anymore:
cRoot::Get()->GetServer()->ClientDestroying(this); cRoot::Get()->GetServer()->ClientDestroying(this);
m_LoadedChunks.clear(); {
m_ChunksToSend.clear(); cCSLock Lock(m_CSChunkLists);
m_LoadedChunks.clear();
m_ChunksToSend.clear();
}
if (m_Player != NULL) if (m_Player != NULL)
{ {
@ -226,12 +229,16 @@ cClientHandle::~cClientHandle()
void cClientHandle::Destroy() void cClientHandle::Destroy()
{ {
m_bDestroyed = true; // Setting m_bDestroyed was moved to the bottom of Destroy(),
// otherwise the destructor may be called within another thread before the client is removed from chunks
// http://forum.mc-server.org/showthread.php?tid=366
if ((m_Player != NULL) && (m_Player->GetWorld() != NULL)) if ((m_Player != NULL) && (m_Player->GetWorld() != NULL))
{ {
RemoveFromAllChunks(); RemoveFromAllChunks();
} }
m_bDestroyed = true;
} }