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

First attempt at fixing the inter-threading deadlocks between the tick thread and the socket thread

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@1591 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com
2013-06-15 15:29:20 +00:00
parent 92fc62fb4b
commit a67760f7c9
4 changed files with 39 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/ClientHandle.cpp
View File

@@ -1957,7 +1957,17 @@ void cClientHandle::PacketError(unsigned char a_PacketType)
void cClientHandle::DataReceived(const char * a_Data, int a_Size)
{
// Data is received from the client, hand it off to the protocol:
m_Protocol->DataReceived(a_Data, a_Size);
if ((m_Player != NULL) && (m_Player->GetWorld() != NULL))
{
// Lock the world, so that plugins reacting to protocol events have already the chunkmap locked
cWorld::cLock(*m_Player->GetWorld());
m_Protocol->DataReceived(a_Data, a_Size);
}
else
{
m_Protocol->DataReceived(a_Data, a_Size);
}
m_TimeSinceLastPacket = 0;
}