summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-11-03 11:57:43 +0100
committermadmaxoft <github@xoft.cz>2013-11-03 11:59:07 +0100
commit53c31ee1cdbfd0cd6c30ddaeac480ccbcb12f21a (patch)
tree0758c315652e30ba1398172bc0c23bbe8fa9f5a8 /source
parentProtoProxy: Fixed the SpawnObjectVehicle packet. (diff)
downloadcuberite-53c31ee1cdbfd0cd6c30ddaeac480ccbcb12f21a.tar
cuberite-53c31ee1cdbfd0cd6c30ddaeac480ccbcb12f21a.tar.gz
cuberite-53c31ee1cdbfd0cd6c30ddaeac480ccbcb12f21a.tar.bz2
cuberite-53c31ee1cdbfd0cd6c30ddaeac480ccbcb12f21a.tar.lz
cuberite-53c31ee1cdbfd0cd6c30ddaeac480ccbcb12f21a.tar.xz
cuberite-53c31ee1cdbfd0cd6c30ddaeac480ccbcb12f21a.tar.zst
cuberite-53c31ee1cdbfd0cd6c30ddaeac480ccbcb12f21a.zip
Diffstat (limited to 'source')
-rw-r--r--source/ClientHandle.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/ClientHandle.cpp b/source/ClientHandle.cpp
index ea8b48f9d..6860a29ca 100644
--- a/source/ClientHandle.cpp
+++ b/source/ClientHandle.cpp
@@ -1470,7 +1470,7 @@ void cClientHandle::Tick(float a_Dt)
}
// If the chunk the player's in was just sent, spawn the player:
- if (m_HasSentPlayerChunk && (m_State != csPlaying))
+ if (m_HasSentPlayerChunk && (m_State != csPlaying) && !IsDestroying())
{
if (!cRoot::Get()->GetPluginManager()->CallHookPlayerJoined(*m_Player))
{
@@ -2138,7 +2138,7 @@ void cClientHandle::PacketUnknown(unsigned char a_PacketType)
LOGERROR("Unknown packet type 0x%02x from client \"%s\" @ %s", a_PacketType, m_Username.c_str(), m_IPString.c_str());
AString Reason;
- Printf(Reason, "[C->S] Unknown PacketID: 0x%02x", a_PacketType);
+ Printf(Reason, "Unknown [C->S] PacketType: 0x%02x", a_PacketType);
SendDisconnect(Reason);
Destroy();
}