From 8be2528350b6fd5a4283e654bbe21d5d35e964d7 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Tue, 13 Mar 2012 20:32:11 +0000 Subject: Removed an unwarranted assert in cChunkSender git-svn-id: http://mc-server.googlecode.com/svn/trunk@409 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/ChunkSender.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'source') diff --git a/source/ChunkSender.cpp b/source/ChunkSender.cpp index 5d7efbdc8..3374a0bff 100644 --- a/source/ChunkSender.cpp +++ b/source/ChunkSender.cpp @@ -78,8 +78,11 @@ void cChunkSender::QueueSendChunkTo(int a_ChunkX, int a_ChunkY, int a_ChunkZ, cC ASSERT(a_Client != NULL); { cCSLock Lock(m_CS); - // It should not be already queued: - ASSERT(std::find(m_SendChunks.begin(), m_SendChunks.end(), sSendChunk(a_ChunkX, a_ChunkY, a_ChunkZ, a_Client)) == m_SendChunks.end()); + if (std::find(m_SendChunks.begin(), m_SendChunks.end(), sSendChunk(a_ChunkX, a_ChunkY, a_ChunkZ, a_Client)) != m_SendChunks.end()) + { + // Already queued, bail out + return; + } m_SendChunks.push_back(sSendChunk(a_ChunkX, a_ChunkY, a_ChunkZ, a_Client)); } m_evtQueue.Set(); -- cgit v1.2.3