flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Removed the split between 1.2.3 and 1.1, left only 1.2.3 code

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@429 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com
2012-03-24 11:40:29 +00:00
parent b69ac328c0
commit e1ef489e08
13 changed files with 11 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
source/packets/cPacket_Login.cpp
View File

@@ -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);