summaryrefslogtreecommitdiffstats
path: root/src/World.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-10-23 22:49:17 +0200
committerMattes D <github@xoft.cz>2014-10-23 22:49:17 +0200
commit4df924cf4b774b68fc7cc6b144e82e47c9fe4444 (patch)
tree454cee2b4b47387ba19e7537de3d5d699be7f9fe /src/World.cpp
parentFixed a crash in redstone simulator. (diff)
parentUse 3 priorities. (diff)
downloadcuberite-4df924cf4b774b68fc7cc6b144e82e47c9fe4444.tar
cuberite-4df924cf4b774b68fc7cc6b144e82e47c9fe4444.tar.gz
cuberite-4df924cf4b774b68fc7cc6b144e82e47c9fe4444.tar.bz2
cuberite-4df924cf4b774b68fc7cc6b144e82e47c9fe4444.tar.lz
cuberite-4df924cf4b774b68fc7cc6b144e82e47c9fe4444.tar.xz
cuberite-4df924cf4b774b68fc7cc6b144e82e47c9fe4444.tar.zst
cuberite-4df924cf4b774b68fc7cc6b144e82e47c9fe4444.zip
Diffstat (limited to 'src/World.cpp')
-rw-r--r--src/World.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/World.cpp b/src/World.cpp
index ff333ad2a..9b7d54670 100644
--- a/src/World.cpp
+++ b/src/World.cpp
@@ -2857,19 +2857,19 @@ void cWorld::RemoveClientFromChunks(cClientHandle * a_Client)
-void cWorld::SendChunkTo(int a_ChunkX, int a_ChunkZ, cClientHandle * a_Client)
+void cWorld::SendChunkTo(int a_ChunkX, int a_ChunkZ, cChunkSender::eChunkPriority a_Priority, cClientHandle * a_Client)
{
- m_ChunkSender.QueueSendChunkTo(a_ChunkX, a_ChunkZ, a_Client);
+ m_ChunkSender.QueueSendChunkTo(a_ChunkX, a_ChunkZ, a_Priority, a_Client);
}
-void cWorld::ForceSendChunkTo(int a_ChunkX, int a_ChunkZ, cClientHandle * a_Client)
+void cWorld::ForceSendChunkTo(int a_ChunkX, int a_ChunkZ, cChunkSender::eChunkPriority a_Priority, cClientHandle * a_Client)
{
a_Client->AddWantedChunk(a_ChunkX, a_ChunkZ);
- m_ChunkSender.QueueSendChunkTo(a_ChunkX, a_ChunkZ, a_Client);
+ m_ChunkSender.QueueSendChunkTo(a_ChunkX, a_ChunkZ, a_Priority, a_Client);
}
@@ -3498,7 +3498,6 @@ void cWorld::AddQueuedPlayers(void)
cClientHandle * Client = (*itr)->GetClientHandle();
if (Client != nullptr)
{
- Client->StreamChunks();
Client->SendPlayerMoveLook();
Client->SendHealth();
Client->SendWholeInventory(*(*itr)->GetWindow());