flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Removed cPackets from cChunk.

Browse Source 
Also decoupled a possible deadlock in player login code.

git-svn-id: http://mc-server.googlecode.com/svn/trunk@788 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com
2012-08-25 17:52:08 +00:00
parent 2c5f9350d6
commit bb25ba4977
6 changed files with 155 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/packets/cPacket_MultiBlock.cpp
View File

@@ -7,15 +7,14 @@
cPacket_MultiBlock::cPacket_MultiBlock( const cPacket_MultiBlock & a_Copy )
cPacket_MultiBlock::cPacket_MultiBlock(const cPacket_MultiBlock & a_Copy)
{
m_PacketID = E_MULTI_BLOCK;
m_ChunkX = a_Copy.m_ChunkX;
m_ChunkZ = a_Copy.m_ChunkZ;
m_PacketID = E_MULTI_BLOCK;
m_ChunkX = a_Copy.m_ChunkX;
m_ChunkZ = a_Copy.m_ChunkZ;
m_NumBlocks = a_Copy.m_NumBlocks;
m_DataSize = a_Copy.m_DataSize;
m_Data = new sBlockChange[m_NumBlocks];
memcpy( m_Data, a_Copy.m_Data, sizeof(sBlockChange)*m_NumBlocks );
m_Data = new sBlockChange[m_NumBlocks];
memcpy(m_Data, a_Copy.m_Data, sizeof(sBlockChange) * m_NumBlocks);
}
@@ -24,7 +23,7 @@ cPacket_MultiBlock::cPacket_MultiBlock( const cPacket_MultiBlock & a_Copy )
cPacket_MultiBlock::~cPacket_MultiBlock()
{
delete [] m_Data;
delete[] m_Data;
}
@@ -38,8 +37,8 @@ void cPacket_MultiBlock::Serialize(AString & a_Data) const
AppendInteger(a_Data, m_ChunkZ);
AppendShort (a_Data, m_NumBlocks);
AppendInteger(a_Data, m_DataSize);
for( int i = 0; i < m_NumBlocks; ++i )
AppendInteger(a_Data, sizeof(*m_Data) * m_NumBlocks);
for (short i = 0; i < m_NumBlocks; ++i)
{
AppendInteger(a_Data, m_Data[i].Data);
}