diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-03-06 15:52:44 +0100 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-03-06 15:52:44 +0100 |
| commit | 8cdd63f06c692f117088909ea5c9b950bba34376 (patch) | |
| tree | f07924d43ede604c6a5fe30df5914c68a8f7f1dc /source/ChunkSender.cpp | |
| parent | Fixed bug FS#157 http://mc-server.org/support/index.php?do=details&task_id=157 (diff) | |
| download | cuberite-8cdd63f06c692f117088909ea5c9b950bba34376.tar cuberite-8cdd63f06c692f117088909ea5c9b950bba34376.tar.gz cuberite-8cdd63f06c692f117088909ea5c9b950bba34376.tar.bz2 cuberite-8cdd63f06c692f117088909ea5c9b950bba34376.tar.lz cuberite-8cdd63f06c692f117088909ea5c9b950bba34376.tar.xz cuberite-8cdd63f06c692f117088909ea5c9b950bba34376.tar.zst cuberite-8cdd63f06c692f117088909ea5c9b950bba34376.zip | |
Diffstat (limited to '')
| -rw-r--r-- | source/ChunkSender.cpp | 113 |
1 files changed, 91 insertions, 22 deletions
diff --git a/source/ChunkSender.cpp b/source/ChunkSender.cpp index 527db4543..47d84d166 100644 --- a/source/ChunkSender.cpp +++ b/source/ChunkSender.cpp @@ -62,12 +62,44 @@ void cChunkSender::ChunkReady(int a_ChunkX, int a_ChunkY, int a_ChunkZ) +void cChunkSender::QueueSendChunkTo(int a_ChunkX, int a_ChunkY, int a_ChunkZ, cClientHandle * a_Client)
+{
+ ASSERT(a_Client != NULL);
+ {
+ cCSLock Lock(m_CS);
+ m_SendChunks.push_back(sSendChunk(a_ChunkX, a_ChunkY, a_ChunkZ, a_Client));
+ }
+ m_Event.Set();
+}
+
+
+
+
+
+void cChunkSender::RemoveClient(cClientHandle * a_Client)
+{
+ cCSLock Lock(m_CS);
+ for (sSendChunkList::iterator itr = m_SendChunks.begin(); itr != m_SendChunks.end();)
+ {
+ if (itr->m_Client == a_Client)
+ {
+ itr = m_SendChunks.erase(itr);
+ continue;
+ }
+ ++itr;
+ } // for itr - m_SendChunks[]
+}
+
+
+
+
+
void cChunkSender::Execute(void)
{
while (!mShouldTerminate)
{
cCSLock Lock(m_CS);
- while (m_ChunksReady.empty())
+ while (m_ChunksReady.empty() && m_SendChunks.empty())
{
cCSUnlock Unlock(Lock);
m_Event.Wait();
@@ -77,28 +109,24 @@ void cChunkSender::Execute(void) }
} // while (empty)
- // Take one from the queue:
- cChunkCoords Coords(m_ChunksReady.front());
- m_ChunksReady.pop_front();
- Lock.Unlock();
-
- ASSERT(m_World != NULL);
-
- // Send it to anyone waiting:
- m_World->GetChunkData(Coords.m_ChunkX, Coords.m_ChunkY, Coords.m_ChunkZ, this);
- cPacket_PreChunk PreChunk(Coords.m_ChunkX, Coords.m_ChunkZ, true);
- cPacket_MapChunk MapChunk(Coords.m_ChunkX, Coords.m_ChunkY, Coords.m_ChunkZ, m_BlockData);
- m_World->BroadcastToChunk(Coords.m_ChunkX, Coords.m_ChunkY, Coords.m_ChunkZ, PreChunk);
- m_World->BroadcastToChunk(Coords.m_ChunkX, Coords.m_ChunkY, Coords.m_ChunkZ, MapChunk);
-
- // Send entity creation packets:
- for (PacketList::iterator itr = m_Packets.begin(); itr != m_Packets.end(); ++itr)
+ if (!m_ChunksReady.empty())
{
- m_World->BroadcastToChunk(Coords.m_ChunkX, Coords.m_ChunkY, Coords.m_ChunkZ, **itr);
- delete *itr;
- } // for itr - m_Packets
- m_Packets.clear();
-
+ // Take one from the queue:
+ cChunkCoords Coords(m_ChunksReady.front());
+ m_ChunksReady.pop_front();
+ Lock.Unlock();
+
+ SendChunk(Coords.m_ChunkX, Coords.m_ChunkY, Coords.m_ChunkZ, NULL);
+ }
+ else
+ {
+ // Take one from the queue:
+ sSendChunk Chunk(m_SendChunks.front());
+ m_SendChunks.pop_front();
+ Lock.Unlock();
+
+ SendChunk(Chunk.m_ChunkX, Chunk.m_ChunkY, Chunk.m_ChunkZ, Chunk.m_Client);
+ }
} // while (!mShouldTerminate)
}
@@ -106,6 +134,47 @@ void cChunkSender::Execute(void) +void cChunkSender::SendChunk(int a_ChunkX, int a_ChunkY, int a_ChunkZ, cClientHandle * a_Client)
+{
+ ASSERT(m_World != NULL);
+
+ // Prepare MapChunk packets:
+ m_World->GetChunkData(a_ChunkX, a_ChunkY, a_ChunkZ, this);
+ cPacket_PreChunk PreChunk(a_ChunkX, a_ChunkZ, true);
+ cPacket_MapChunk MapChunk(a_ChunkX, a_ChunkY, a_ChunkZ, m_BlockData);
+
+ // Send:
+ if (a_Client == NULL)
+ {
+ m_World->BroadcastToChunk(a_ChunkX, a_ChunkY, a_ChunkZ, PreChunk);
+ m_World->BroadcastToChunk(a_ChunkX, a_ChunkY, a_ChunkZ, MapChunk);
+ }
+ else
+ {
+ a_Client->Send(PreChunk);
+ a_Client->Send(MapChunk);
+ }
+
+ // Send entity creation packets:
+ for (PacketList::iterator itr = m_Packets.begin(); itr != m_Packets.end(); ++itr)
+ {
+ if (a_Client == NULL)
+ {
+ m_World->BroadcastToChunk(a_ChunkX, a_ChunkY, a_ChunkZ, **itr);
+ }
+ else
+ {
+ a_Client->Send(**itr);
+ }
+ delete *itr;
+ } // for itr - m_Packets[]
+ m_Packets.clear();
+}
+
+
+
+
+
void cChunkSender::BlockData(const char * a_Data)
{
memcpy(m_BlockData, a_Data, cChunk::c_BlockDataSize);
|