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

ProtoProxy: Fixed SpawnMob packet.

Browse Source
This commit is contained in:
madmaxoft 2013-11-07 17:13:25 +01:00
parent 034a283a28
commit e7ba63b43c
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
Tools/ProtoProxy/Connection.cpp
View File

@ -2151,17 +2151,17 @@ bool cConnection::HandleServerSpawnExperienceOrbs(void)
bool cConnection::HandleServerSpawnMob(void) bool cConnection::HandleServerSpawnMob(void)
{ {
HANDLE_SERVER_PACKET_READ(ReadBEInt, int, EntityID); HANDLE_SERVER_PACKET_READ(ReadVarInt, UInt32, EntityID);
HANDLE_SERVER_PACKET_READ(ReadChar, char, MobType); HANDLE_SERVER_PACKET_READ(ReadChar, char, MobType);
HANDLE_SERVER_PACKET_READ(ReadBEInt, int, PosX); HANDLE_SERVER_PACKET_READ(ReadBEInt, int, PosX);
HANDLE_SERVER_PACKET_READ(ReadBEInt, int, PosY); HANDLE_SERVER_PACKET_READ(ReadBEInt, int, PosY);
HANDLE_SERVER_PACKET_READ(ReadBEInt, int, PosZ); HANDLE_SERVER_PACKET_READ(ReadBEInt, int, PosZ);
HANDLE_SERVER_PACKET_READ(ReadByte, Byte, Yaw); HANDLE_SERVER_PACKET_READ(ReadByte, Byte, Yaw);
HANDLE_SERVER_PACKET_READ(ReadByte, Byte, Pitch); HANDLE_SERVER_PACKET_READ(ReadByte, Byte, Pitch);
HANDLE_SERVER_PACKET_READ(ReadByte, Byte, HeadYaw); HANDLE_SERVER_PACKET_READ(ReadByte, Byte, HeadYaw);
HANDLE_SERVER_PACKET_READ(ReadBEShort, short, VelocityX); HANDLE_SERVER_PACKET_READ(ReadBEShort, short, VelocityX);
HANDLE_SERVER_PACKET_READ(ReadBEShort, short, VelocityY); HANDLE_SERVER_PACKET_READ(ReadBEShort, short, VelocityY);
HANDLE_SERVER_PACKET_READ(ReadBEShort, short, VelocityZ); HANDLE_SERVER_PACKET_READ(ReadBEShort, short, VelocityZ);
AString Metadata; AString Metadata;
if (!ParseMetadata(m_ServerBuffer, Metadata)) if (!ParseMetadata(m_ServerBuffer, Metadata))
{ {
@ -2170,7 +2170,7 @@ bool cConnection::HandleServerSpawnMob(void)
AString HexDump; AString HexDump;
CreateHexDump(HexDump, Metadata.data(), Metadata.size(), 32); CreateHexDump(HexDump, Metadata.data(), Metadata.size(), 32);
Log("Received a PACKET_SPAWN_MOB from the server:"); Log("Received a PACKET_SPAWN_MOB from the server:");
Log(" EntityID = %d", EntityID); Log(" EntityID = %u (0x%x)", EntityID, EntityID);
Log(" MobType = %d", MobType); Log(" MobType = %d", MobType);
Log(" Pos = %s", PrintableAbsIntTriplet(PosX, PosY, PosZ).c_str()); Log(" Pos = %s", PrintableAbsIntTriplet(PosX, PosY, PosZ).c_str());
Log(" Angles = [%d, %d, %d]", Yaw, Pitch, HeadYaw); Log(" Angles = [%d, %d, %d]", Yaw, Pitch, HeadYaw);
@ -2705,6 +2705,7 @@ bool cConnection::ParseMetadata(cByteBuffer & a_Buffer, AString & a_Metadata)
break; break;
} }
case 6: Length = 12; break; // 3 * int case 6: Length = 12; break; // 3 * int
case 7:
default: default:
{ {
ASSERT(!"Unknown metadata type"); ASSERT(!"Unknown metadata type");