Merge

--HG--
branch : trunk

1 files changed, 3 insertions, 3 deletions

diff --git a/src/game/UpdateData.cpp b/src/game/UpdateData.cpp
index d041c6100fc..a3192b74b0e 100644
--- a/src/game/UpdateData.cpp
+++ b/src/game/UpdateData.cpp
@@ -105,7 +105,9 @@ void UpdateData::Compress(void* dst, uint32 *dst_size, void* src, int src_size)
 
 bool UpdateData::BuildPacket(WorldPacket *packet)
 {
-    ByteBuffer buf(4+(m_outOfRangeGUIDs.empty() ? 0 : 1+4+9*m_outOfRangeGUIDs.size())+m_data.wpos());
+    ASSERT(packet->empty());                                // shouldn't happen
+
+    ByteBuffer buf(4 + (m_outOfRangeGUIDs.empty() ? 0 : 1 + 4 + 9 * m_outOfRangeGUIDs.size()) + m_data.wpos());
 
     buf << (uint32) (!m_outOfRangeGUIDs.empty() ? m_blockCount + 1 : m_blockCount);
 
@@ -122,8 +124,6 @@ bool UpdateData::BuildPacket(WorldPacket *packet)
 
     buf.append(m_data);
 
-    packet->clear();
-
     size_t pSize = buf.wpos();                              // use real used data size
 
     if (pSize > 100 )                                       // compress large packets