From 4ee4cab2d3f523286ca415cec6b4225fc03b4ea9 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Sun, 15 Dec 2013 20:12:40 +0100 Subject: Fixed calling OnPlayerJoined() in the wrong place. This is the first part of a fix for #187. --- src/ClientHandle.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/ClientHandle.cpp') 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; } -- cgit v1.2.3