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_Login.cpp | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'source/packets/cPacket_Login.cpp') diff --git a/source/packets/cPacket_Login.cpp b/source/packets/cPacket_Login.cpp index bbb81ef52..588892b3a 100644 --- a/source/packets/cPacket_Login.cpp +++ b/source/packets/cPacket_Login.cpp @@ -21,16 +21,9 @@ int cPacket_Login::Parse(const char * a_Data, int a_Size) m_Username.clear(); HANDLE_PACKET_READ(ReadInteger, m_ProtocolVersion, TotalBytes); HANDLE_PACKET_READ(ReadString16, m_Username, TotalBytes); -#if (MINECRAFT_1_2_2 != 1 ) - HANDLE_PACKET_READ(ReadLong, m_MapSeed, TotalBytes); -#endif HANDLE_PACKET_READ(ReadString16, m_LevelType, TotalBytes); HANDLE_PACKET_READ(ReadInteger, m_ServerMode, TotalBytes); -#if (MINECRAFT_1_2_2 == 1 ) HANDLE_PACKET_READ(ReadInteger, m_Dimension, TotalBytes); -#else - HANDLE_PACKET_READ(ReadByte, m_Dimension, TotalBytes); -#endif HANDLE_PACKET_READ(ReadByte, m_Difficulty, TotalBytes); HANDLE_PACKET_READ(ReadByte, m_WorldHeight, TotalBytes); HANDLE_PACKET_READ(ReadByte, m_MaxPlayers, TotalBytes); @@ -46,16 +39,9 @@ void cPacket_Login::Serialize(AString & a_Data) const AppendByte (a_Data, m_PacketID); AppendInteger (a_Data, m_ProtocolVersion); AppendString16(a_Data, m_Username); -#if (MINECRAFT_1_2_2 != 1 ) - AppendLong (a_Data, m_MapSeed); -#endif AppendString16(a_Data, m_LevelType); AppendInteger (a_Data, m_ServerMode); -#if (MINECRAFT_1_2_2 == 1 ) AppendInteger (a_Data, m_Dimension); -#else - AppendByte (a_Data, m_Dimension); -#endif AppendByte (a_Data, m_Difficulty); AppendByte (a_Data, m_WorldHeight); AppendByte (a_Data, m_MaxPlayers); -- cgit v1.2.3