summaryrefslogtreecommitdiffstats
path: root/source/packets/cPacket_Respawn.h
diff options
context:
space:
mode:
authormadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-03-24 12:40:29 +0100
committermadmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>2012-03-24 12:40:29 +0100
commite1ef489e08a91cce377617b99f4c3ed3df5e9d92 (patch)
tree93472b45e79bce29c1be696ced78a7ef6affd45e /source/packets/cPacket_Respawn.h
parentReverted the previous commit - it is useless, since entities still depend heavily on cWorld (diff)
downloadcuberite-e1ef489e08a91cce377617b99f4c3ed3df5e9d92.tar
cuberite-e1ef489e08a91cce377617b99f4c3ed3df5e9d92.tar.gz
cuberite-e1ef489e08a91cce377617b99f4c3ed3df5e9d92.tar.bz2
cuberite-e1ef489e08a91cce377617b99f4c3ed3df5e9d92.tar.lz
cuberite-e1ef489e08a91cce377617b99f4c3ed3df5e9d92.tar.xz
cuberite-e1ef489e08a91cce377617b99f4c3ed3df5e9d92.tar.zst
cuberite-e1ef489e08a91cce377617b99f4c3ed3df5e9d92.zip
Diffstat (limited to 'source/packets/cPacket_Respawn.h')
-rw-r--r--source/packets/cPacket_Respawn.h21
1 files changed, 1 insertions, 20 deletions
diff --git a/source/packets/cPacket_Respawn.h b/source/packets/cPacket_Respawn.h
index dbb4957c5..b95ecc384 100644
--- a/source/packets/cPacket_Respawn.h
+++ b/source/packets/cPacket_Respawn.h
@@ -13,42 +13,23 @@ class cPacket_Respawn : public cPacket
{
public:
cPacket_Respawn()
-#if (MINECRAFT_1_2_2 == 1)
: m_Dimension( 0 )
, m_Difficulty( 0 )
, m_CreativeMode( 0 )
, m_WorldHeight( 0 )
, m_LevelType( cPacket_Login::LEVEL_TYPE_DEFAULT )
-#else
- : m_World( 0 )
- , m_Difficulty( 0 )
- , m_CreativeMode( 0 )
- , m_WorldHeight( 0 )
- , m_MapSeed( 0 )
- , m_LevelType( cPacket_Login::LEVEL_TYPE_DEFAULT )
-#endif
{ m_PacketID = E_RESPAWN; }
+
virtual cPacket* Clone() const { return new cPacket_Respawn( *this ); }
virtual int Parse(const char * a_Data, int a_Size) override;
virtual void Serialize(AString & a_Data) const override;
-#if (MINECRAFT_1_2_2 == 1)
int m_Dimension;
char m_Difficulty;
char m_CreativeMode;
short m_WorldHeight;
AString m_LevelType;
-#else
- char m_World;
- char m_Difficulty;
- char m_CreativeMode;
- short m_WorldHeight;
- long long m_MapSeed;
- AString m_LevelType;
-#endif
-
- static const unsigned int c_Size = 1 + 1 + 1 + 1 + 2 + 8 + 2;
};