From 957ef3b2974991ca940fc8a78e518304377d8e6d Mon Sep 17 00:00:00 2001 From: faketruth Date: Thu, 1 Mar 2012 17:07:41 +0000 Subject: Started carefully moving to 1.2.2 Clients can get up to the login packet, after which the server tries to send chunks but in the wrong format and the client disconnects git-svn-id: http://mc-server.googlecode.com/svn/trunk@347 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/packets/cPacket_Login.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'source/packets/cPacket_Login.cpp') diff --git a/source/packets/cPacket_Login.cpp b/source/packets/cPacket_Login.cpp index a96d456cc..bbb81ef52 100644 --- a/source/packets/cPacket_Login.cpp +++ b/source/packets/cPacket_Login.cpp @@ -21,10 +21,16 @@ 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); @@ -40,10 +46,16 @@ 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