From 2a1d75ab098a9d2b330c15212be958ac3d5e0f0e Mon Sep 17 00:00:00 2001 From: faketruth Date: Mon, 26 Dec 2011 14:29:52 +0000 Subject: [PATCH] Fixed the little check for max players. If somehow a player was able to connect and the number of players would exceed the max players, everybody is allowed in and the server will never be 'full'. It's fixed now git-svn-id: http://mc-server.googlecode.com/svn/trunk@122 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cClientHandle.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/source/cClientHandle.cpp b/source/cClientHandle.cpp index 1182e2e58..4e71c7169 100644 --- a/source/cClientHandle.cpp +++ b/source/cClientHandle.cpp @@ -415,15 +415,15 @@ void cClientHandle::HandlePacket( cPacket* a_Packet ) switch( a_Packet->m_PacketID ) { case E_NEW_INVALID_STATE: // New/Invalid State packet received. I'm guessing the client only sends it when there's a problem with the bed? - { - LOGINFO("Got New Invalid State packet"); - } - break; + { + LOGINFO("Got New Invalid State packet"); + } + break; case E_CREATE_INVENTORY_ACTION: // I don't think we need to do anything with this packet, but justin case... - { - LOGINFO("Got Create Inventory Action packet"); - } - break; + { + LOGINFO("Got Create Inventory Action packet"); + } + break; case E_PING: // Somebody tries to retrieve information about the server { LOGINFO("Got ping"); @@ -441,7 +441,7 @@ void cClientHandle::HandlePacket( cPacket* a_Packet ) LOG("HANDSHAKE %s", GetUsername() ); cPacket_Chat Connecting(m_pState->Username + " is connecting."); - if (cRoot::Get()->GetWorld()->GetNumPlayers() == cRoot::Get()->GetWorld()->GetMaxPlayers()) { + if (cRoot::Get()->GetWorld()->GetNumPlayers() >= cRoot::Get()->GetWorld()->GetMaxPlayers()) { Kick("The server is currently full :( -- Try again later"); break; }