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

Extended SocketThreads for writing support (unusable in cClientHandle due to too many deadlock possibilities)

Browse Source 
Extended the range of ignored packets in pre-game client states (fixes connection issues with some mods installed)

git-svn-id: http://mc-server.googlecode.com/svn/trunk@327 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com
2012-02-25 23:48:28 +00:00
parent bf19f7ae9c
commit a14e015354
4 changed files with 231 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/cClientHandle.cpp
View File

@@ -151,7 +151,7 @@ cClientHandle::~cClientHandle()
{
LOG("Deleting client \"%s\"", GetUsername().c_str());
// Remove from cSocketThreads, just in case
// Remove from cSocketThreads, we're not to be called anymore:
cRoot::Get()->GetServer()->ClientDestroying(this);
m_LoadedChunks.clear();
@@ -225,14 +225,6 @@ void cClientHandle::Destroy()
{
RemoveFromAllChunks();
}
if (m_Socket.IsValid())
{
m_Socket.CloseSocket();
}
// Synchronize with the cSocketThreads (so that they don't call us anymore)
cRoot::Get()->GetServer()->ClientDestroying(this);
}
@@ -489,6 +481,7 @@ void cClientHandle::HandlePacket(cPacket * a_Packet)
// Ignored packets:
case E_PLAYERLOOK:
case E_CHAT:
case E_PLAYERMOVELOOK:
case E_PLAYERPOS:
case E_KEEP_ALIVE: break;
@@ -504,6 +497,8 @@ void cClientHandle::HandlePacket(cPacket * a_Packet)
{
// Ignored packets:
case E_KEEP_ALIVE:
case E_CHAT:
case E_FLYING:
case E_PLAYERLOOK:
case E_PLAYERMOVELOOK:
case E_PLAYERPOS: break;
@@ -520,6 +515,8 @@ void cClientHandle::HandlePacket(cPacket * a_Packet)
{
// Ignored packets:
case E_KEEP_ALIVE:
case E_CHAT:
case E_FLYING:
case E_PLAYERLOOK:
case E_PLAYERMOVELOOK:
case E_PLAYERPOS: break;
@@ -535,6 +532,8 @@ void cClientHandle::HandlePacket(cPacket * a_Packet)
{
// Ignored packets:
case E_KEEP_ALIVE:
case E_CHAT:
case E_FLYING:
case E_PLAYERLOOK:
case E_PLAYERPOS: break;