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

Fix Destroy() calling behaviour

Browse Source 
* Fixes Core/#142
This commit is contained in:
Tiger Wang 2015-05-30 00:23:34 +01:00
parent 1dfc7bbce2
commit 291370e367
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ClientHandle.cpp
View File

@ -2181,11 +2181,12 @@ void cClientHandle::SendDestroyEntity(const cEntity & a_Entity)
void cClientHandle::SendDisconnect(const AString & a_Reason) void cClientHandle::SendDisconnect(const AString & a_Reason)
{ {
// Destruction (Destroy()) is called when the client disconnects, not when a disconnect packet (or anything else) is sent
// Otherwise, the cClientHandle instance is can be unexpectedly removed from the associated player - Core/#142
if (!m_HasSentDC) if (!m_HasSentDC)
{ {
LOGD("Sending a DC: \"%s\"", StripColorCodes(a_Reason).c_str()); LOGD("Sending a DC: \"%s\"", StripColorCodes(a_Reason).c_str());
m_Protocol->SendDisconnect(a_Reason); m_Protocol->SendDisconnect(a_Reason);
Destroy();
m_HasSentDC = true; m_HasSentDC = true;
} }
} }