diff options
author | madmaxoft <github@xoft.cz> | 2014-03-29 23:05:17 +0100 |
---|---|---|
committer | madmaxoft <github@xoft.cz> | 2014-03-29 23:05:17 +0100 |
commit | 47a427d3dc1aafa1de5d55faa60e666e64ba7bd3 (patch) | |
tree | 3d9e203397178a6874b0430773731693cbd03ab6 /src/ClientHandle.cpp | |
parent | NetherFortGen: Added several more prefabs. (diff) | |
parent | cPrefab now uses a struct for block type definition in CharMap. (diff) | |
download | cuberite-47a427d3dc1aafa1de5d55faa60e666e64ba7bd3.tar cuberite-47a427d3dc1aafa1de5d55faa60e666e64ba7bd3.tar.gz cuberite-47a427d3dc1aafa1de5d55faa60e666e64ba7bd3.tar.bz2 cuberite-47a427d3dc1aafa1de5d55faa60e666e64ba7bd3.tar.lz cuberite-47a427d3dc1aafa1de5d55faa60e666e64ba7bd3.tar.xz cuberite-47a427d3dc1aafa1de5d55faa60e666e64ba7bd3.tar.zst cuberite-47a427d3dc1aafa1de5d55faa60e666e64ba7bd3.zip |
Diffstat (limited to '')
-rw-r--r-- | src/ClientHandle.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp index 46c10ae82..eb05ebdb7 100644 --- a/src/ClientHandle.cpp +++ b/src/ClientHandle.cpp @@ -1606,10 +1606,8 @@ void cClientHandle::MoveToWorld(cWorld & a_World, bool a_SendRespawnPacket) m_Protocol->SendUnloadChunk(itr->m_ChunkX, itr->m_ChunkZ); } // for itr - Chunks[] - // Do NOT stream new chunks, the new world runs its own tick thread and may deadlock - // Instead, the chunks will be streamed when the client is moved to the new world's Tick list, - // by setting state to csAuthenticated - m_State = csAuthenticated; + // StreamChunks() called in cPlayer::MoveToWorld() after new world has been set + // Meanwhile here, we set last streamed values to bogus ones so everything is resent m_LastStreamedChunkX = 0x7fffffff; m_LastStreamedChunkZ = 0x7fffffff; m_HasSentPlayerChunk = false; |