From e1ef489e08a91cce377617b99f4c3ed3df5e9d92 Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sat, 24 Mar 2012 11:40:29 +0000 Subject: Removed the split between 1.2.3 and 1.1, left only 1.2.3 code git-svn-id: http://mc-server.googlecode.com/svn/trunk@429 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/packets/cPacket_Respawn.h | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) (limited to 'source/packets/cPacket_Respawn.h') 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; }; -- cgit v1.2.3