summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-03-29 02:21:56 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-03-29 02:21:56 +0100
commitfb16554322e3995f065135b481fffd58a5b2551e (patch)
tree8edbe0e13bcc85787cef931c59410a7857f25aca /src
parentFixed #721 and FS439 (diff)
downloadcuberite-fb16554322e3995f065135b481fffd58a5b2551e.tar
cuberite-fb16554322e3995f065135b481fffd58a5b2551e.tar.gz
cuberite-fb16554322e3995f065135b481fffd58a5b2551e.tar.bz2
cuberite-fb16554322e3995f065135b481fffd58a5b2551e.tar.lz
cuberite-fb16554322e3995f065135b481fffd58a5b2551e.tar.xz
cuberite-fb16554322e3995f065135b481fffd58a5b2551e.tar.zst
cuberite-fb16554322e3995f065135b481fffd58a5b2551e.zip
Diffstat (limited to 'src')
-rw-r--r--src/ClientHandle.cpp6
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;