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.cpp | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'source/packets/cPacket_Respawn.cpp') diff --git a/source/packets/cPacket_Respawn.cpp b/source/packets/cPacket_Respawn.cpp index 12c30deaa..a6b3b5bc4 100644 --- a/source/packets/cPacket_Respawn.cpp +++ b/source/packets/cPacket_Respawn.cpp @@ -11,20 +11,11 @@ void cPacket_Respawn::Serialize(AString & a_Data) const { AppendByte (a_Data, m_PacketID); -#if (MINECRAFT_1_2_2 == 1) AppendInteger (a_Data, m_Dimension); AppendByte (a_Data, m_Difficulty); AppendByte (a_Data, m_CreativeMode); AppendShort (a_Data, m_WorldHeight); AppendString16(a_Data, m_LevelType); -#else - AppendByte (a_Data, m_World); - AppendByte (a_Data, m_Difficulty); - AppendByte (a_Data, m_CreativeMode); - AppendShort (a_Data, m_WorldHeight); - AppendLong (a_Data, m_MapSeed); - AppendString16(a_Data, m_LevelType); -#endif } @@ -35,20 +26,11 @@ int cPacket_Respawn::Parse(const char * a_Data, int a_Size) { int TotalBytes = 0; -#if (MINECRAFT_1_2_2 == 1) HANDLE_PACKET_READ(ReadInteger, m_Dimension, TotalBytes); HANDLE_PACKET_READ(ReadByte, m_Difficulty, TotalBytes); HANDLE_PACKET_READ(ReadByte, m_CreativeMode, TotalBytes); HANDLE_PACKET_READ(ReadShort, m_WorldHeight, TotalBytes); HANDLE_PACKET_READ(ReadString16, m_LevelType, TotalBytes); -#else - HANDLE_PACKET_READ(ReadByte, m_World, TotalBytes); - HANDLE_PACKET_READ(ReadByte, m_Difficulty, TotalBytes); - HANDLE_PACKET_READ(ReadByte, m_CreativeMode, TotalBytes); - HANDLE_PACKET_READ(ReadShort, m_WorldHeight, TotalBytes); - HANDLE_PACKET_READ(ReadLong, m_MapSeed, TotalBytes); - HANDLE_PACKET_READ(ReadString16, m_LevelType, TotalBytes); -#endif return TotalBytes; } -- cgit v1.2.3