diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-03-24 12:40:29 +0100 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2012-03-24 12:40:29 +0100 |
| commit | e1ef489e08a91cce377617b99f4c3ed3df5e9d92 (patch) | |
| tree | 93472b45e79bce29c1be696ced78a7ef6affd45e /source/packets/cPacket_Respawn.cpp | |
| parent | Reverted the previous commit - it is useless, since entities still depend heavily on cWorld (diff) | |
| download | cuberite-e1ef489e08a91cce377617b99f4c3ed3df5e9d92.tar cuberite-e1ef489e08a91cce377617b99f4c3ed3df5e9d92.tar.gz cuberite-e1ef489e08a91cce377617b99f4c3ed3df5e9d92.tar.bz2 cuberite-e1ef489e08a91cce377617b99f4c3ed3df5e9d92.tar.lz cuberite-e1ef489e08a91cce377617b99f4c3ed3df5e9d92.tar.xz cuberite-e1ef489e08a91cce377617b99f4c3ed3df5e9d92.tar.zst cuberite-e1ef489e08a91cce377617b99f4c3ed3df5e9d92.zip | |
Diffstat (limited to 'source/packets/cPacket_Respawn.cpp')
| -rw-r--r-- | source/packets/cPacket_Respawn.cpp | 18 |
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;
}
|