diff options
| author | Mattes D <github@xoft.cz> | 2014-10-24 10:13:54 +0200 |
|---|---|---|
| committer | Mattes D <github@xoft.cz> | 2014-10-24 10:13:54 +0200 |
| commit | 2940ced832e506fb1bb2b5292d49b2c7c31afb5b (patch) | |
| tree | 9b5c06b80b752eda2cb5dd25d271d50d9eb1dc1f /src/World.cpp | |
| parent | Reimplemented cEvent using C++11 primitives. (diff) | |
| parent | Merge pull request #1565 from mc-server/MergedIniFile (diff) | |
| download | cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.gz cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.bz2 cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.lz cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.xz cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.tar.zst cuberite-2940ced832e506fb1bb2b5292d49b2c7c31afb5b.zip | |
Diffstat (limited to 'src/World.cpp')
| -rw-r--r-- | src/World.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/World.cpp b/src/World.cpp index ff333ad2a..2e079d447 100644 --- a/src/World.cpp +++ b/src/World.cpp @@ -8,7 +8,7 @@ #include "Server.h" #include "Item.h" #include "Root.h" -#include "inifile/iniFile.h" +#include "IniFile.h" #include "ChunkMap.h" #include "Generating/ChunkDesc.h" #include "OSSupport/Timer.h" @@ -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()); |