diff options
author | madmaxoft <github@xoft.cz> | 2013-12-15 20:12:40 +0100 |
---|---|---|
committer | madmaxoft <github@xoft.cz> | 2013-12-15 20:12:55 +0100 |
commit | 4ee4cab2d3f523286ca415cec6b4225fc03b4ea9 (patch) | |
tree | 3aae6b77371f5b1518a6e57a2397d6108de2713a | |
parent | Merge pull request #433 from mc-server/redstoneimprovements (diff) | |
download | cuberite-4ee4cab2d3f523286ca415cec6b4225fc03b4ea9.tar cuberite-4ee4cab2d3f523286ca415cec6b4225fc03b4ea9.tar.gz cuberite-4ee4cab2d3f523286ca415cec6b4225fc03b4ea9.tar.bz2 cuberite-4ee4cab2d3f523286ca415cec6b4225fc03b4ea9.tar.lz cuberite-4ee4cab2d3f523286ca415cec6b4225fc03b4ea9.tar.xz cuberite-4ee4cab2d3f523286ca415cec6b4225fc03b4ea9.tar.zst cuberite-4ee4cab2d3f523286ca415cec6b4225fc03b4ea9.zip |
-rw-r--r-- | src/ClientHandle.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp index d585eccf1..c5fe270d3 100644 --- a/src/ClientHandle.cpp +++ b/src/ClientHandle.cpp @@ -1498,13 +1498,8 @@ 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) && !IsDestroying()) + if (m_HasSentPlayerChunk && (m_State == csDownloadingWorld)) { - if (!cRoot::Get()->GetPluginManager()->CallHookPlayerJoined(*m_Player)) - { - // Broadcast that this player has joined the game! Yay~ - m_Player->GetWorld()->BroadcastChat(m_Username + " joined the game!", this); - } m_Protocol->SendPlayerMoveLook(); m_State = csPlaying; } |