diff options
Diffstat (limited to 'source/ClientHandle.cpp')
| -rw-r--r-- | source/ClientHandle.cpp | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/source/ClientHandle.cpp b/source/ClientHandle.cpp index 6860a29ca..86a4aecc8 100644 --- a/source/ClientHandle.cpp +++ b/source/ClientHandle.cpp @@ -205,7 +205,7 @@ void cClientHandle::Kick(const AString & a_Reason) { if (m_State >= csAuthenticating) // Don't log pings { - LOG("Kicking user \"%s\" for \"%s\"", m_Username.c_str(), a_Reason.c_str()); + LOG("Kicking user \"%s\" for \"%s\"", m_Username.c_str(), StripColorCodes(a_Reason).c_str()); } SendDisconnect(a_Reason); } @@ -255,8 +255,8 @@ void cClientHandle::Authenticate(void) // Send time m_Protocol->SendTimeUpdate(World->GetWorldAge(), World->GetTimeOfDay()); - // Send inventory - m_Player->GetInventory().SendWholeInventory(*this); + // Send contents of the inventory window + m_Protocol->SendWholeInventory(*m_Player->GetWindow()); // Send health m_Player->SendHealth(); @@ -2004,15 +2004,6 @@ void cClientHandle::SendWeather(eWeather a_Weather) -void cClientHandle::SendWholeInventory(const cInventory & a_Inventory) -{ - m_Protocol->SendWholeInventory(a_Inventory); -} - - - - - void cClientHandle::SendWholeInventory(const cWindow & a_Window) { m_Protocol->SendWholeInventory(a_Window); @@ -2196,7 +2187,7 @@ void cClientHandle::SocketClosed(void) { // The socket has been closed for any reason - LOG("Client \"%s\" @ %s disconnected", m_Username.c_str(), m_IPString.c_str()); + LOGD("Client \"%s\" @ %s disconnected", m_Username.c_str(), m_IPString.c_str()); Destroy(); } |