summaryrefslogtreecommitdiffstats
path: root/src/World.cpp
diff options
context:
space:
mode:
authorMattes D <github@xoft.cz>2014-10-24 10:19:13 +0200
committerMattes D <github@xoft.cz>2014-10-24 10:19:13 +0200
commit765bf006ad28d6dfcddd6c29ec203bbc7753e332 (patch)
tree2ddd79061104d4a4f80442a432a52fd81120e631 /src/World.cpp
parentSuggestions (diff)
parentMerge pull request #1565 from mc-server/MergedIniFile (diff)
downloadcuberite-765bf006ad28d6dfcddd6c29ec203bbc7753e332.tar
cuberite-765bf006ad28d6dfcddd6c29ec203bbc7753e332.tar.gz
cuberite-765bf006ad28d6dfcddd6c29ec203bbc7753e332.tar.bz2
cuberite-765bf006ad28d6dfcddd6c29ec203bbc7753e332.tar.lz
cuberite-765bf006ad28d6dfcddd6c29ec203bbc7753e332.tar.xz
cuberite-765bf006ad28d6dfcddd6c29ec203bbc7753e332.tar.zst
cuberite-765bf006ad28d6dfcddd6c29ec203bbc7753e332.zip
Diffstat (limited to 'src/World.cpp')
-rw-r--r--src/World.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/World.cpp b/src/World.cpp
index 65f607ee0..7dce666b7 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 "SetChunkData.h"
@@ -2851,19 +2851,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);
}
@@ -3492,7 +3492,6 @@ void cWorld::AddQueuedPlayers(void)
cClientHandle * Client = (*itr)->GetClientHandle();
if (Client != nullptr)
{
- Client->StreamChunks();
Client->SendPlayerMoveLook();
Client->SendHealth();
Client->SendWholeInventory(*(*itr)->GetWindow());