From 4dda2a5c2bf594a401f591095faf2c7e8ba19a7d Mon Sep 17 00:00:00 2001 From: faketruth Date: Fri, 2 Mar 2012 01:22:06 +0000 Subject: MultiBlock packet is working partly.. I really don't understand what's wrong with this packet :/ git-svn-id: http://mc-server.googlecode.com/svn/trunk@351 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/packets/cPacket_MultiBlock.h | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'source/packets/cPacket_MultiBlock.h') diff --git a/source/packets/cPacket_MultiBlock.h b/source/packets/cPacket_MultiBlock.h index aeabbbfed..cd2e5b8f7 100644 --- a/source/packets/cPacket_MultiBlock.h +++ b/source/packets/cPacket_MultiBlock.h @@ -10,13 +10,28 @@ 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 + }; + cPacket_MultiBlock() : m_ChunkX( 0 ) , m_ChunkZ( 0 ) , m_NumBlocks( 0 ) +#if (MINECRAFT_1_2_2 == 1) + , m_DataSize( 0 ) + , m_Data( 0 ) +#else , m_BlockCoordinates( 0 ) , m_BlockTypes( 0 ) , m_BlockMetas( 0 ) +#endif { m_PacketID = E_MULTI_BLOCK; } cPacket_MultiBlock( const cPacket_MultiBlock & a_Copy ); ~cPacket_MultiBlock(); @@ -28,11 +43,17 @@ public: int m_ChunkZ; short m_NumBlocks; +#if (MINECRAFT_1_2_2 == 1) + int m_DataSize; // Should be 4*m_NumBlocks ?? + sBlockChange* m_Data; + static const unsigned int cSize = 1 + 4 + 4 + 2 + 4; // Minimum size (when NumBlocks == 0) +#else static const unsigned int c_Size = 1 + 4 + 4 + 2; // Minimum size (when NumBlocks == 0) unsigned short* m_BlockCoordinates; // x<<12 | z<<8 | y char* m_BlockTypes; char* m_BlockMetas; +#endif }; -- cgit v1.2.3