summaryrefslogtreecommitdiffstats
path: root/source/packets/cPacket_Respawn.cpp
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--source/packets/cPacket_Respawn.cpp18
1 files changed, 0 insertions, 18 deletions
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;
}