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

24
source/packets/cPacket_MultiBlock.h
View File

@@ -12,34 +12,30 @@ class cPacket_MultiBlock : public cPacket
public:
struct sBlockChange
{
sBlockChange()
: Data( 0 )
{}
unsigned int Data;
// short Data; // 4bits metadata ... 12bits block ID
// short Coords; // 8bits Y ... 4bits Z ... 4bits X
// short Data; // 4bits metadata ... 12bits block ID
// short Coords; // 8bits Y ... 4bits Z ... 4bits X
};
cPacket_MultiBlock()
: m_ChunkX( 0 )
, m_ChunkZ( 0 )
, m_NumBlocks( 0 )
, m_DataSize( 0 )
, m_Data( NULL )
{ m_PacketID = E_MULTI_BLOCK; }
{
m_PacketID = E_MULTI_BLOCK;
}
cPacket_MultiBlock( const cPacket_MultiBlock & a_Copy );
cPacket_MultiBlock(const cPacket_MultiBlock & a_Copy);
~cPacket_MultiBlock();
virtual cPacket* Clone() const { return new cPacket_MultiBlock(*this); }
virtual void Serialize(AString & a_Data) const override;
int m_ChunkX;
int m_ChunkZ;
short m_NumBlocks;
int m_DataSize; // Should be 4 * m_NumBlocks ??
sBlockChange * m_Data;
int m_ChunkX;
int m_ChunkZ;
short m_NumBlocks;
sBlockChange * m_Data; // m_NumBlocks items in the array
};