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

ProtoProxy: Fixed the SpawnObjectVehicle packet.

Browse Source
This commit is contained in:
madmaxoft 2013-11-03 00:01:56 +01:00
parent 81aa5f3419
commit cd52eeb223
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Tools/ProtoProxy/Connection.cpp
View File

@ -615,6 +615,15 @@ bool cConnection::DecodeServersPackets(const char * a_Data, int a_Size)
m_ServerBuffer.ResetRead(); m_ServerBuffer.ResetRead();
break; break;
} }
if (PacketLen == 0)
{
m_ServerBuffer.ResetRead();
AString All;
m_ServerBuffer.ReadAll(All);
DataLog(All.data(), All.size(), "====== Received a bad packet length? Inspect the contents below ======");
m_ServerBuffer.CommitRead(); // Try to recover by marking everything as read
break;
}
UInt32 PacketType, PacketReadSoFar; UInt32 PacketType, PacketReadSoFar;
PacketReadSoFar = m_ServerBuffer.GetReadableSpace(); PacketReadSoFar = m_ServerBuffer.GetReadableSpace();
VERIFY(m_ServerBuffer.ReadVarInt(PacketType)); VERIFY(m_ServerBuffer.ReadVarInt(PacketType));
@ -1891,6 +1900,7 @@ bool cConnection::HandleServerMapChunkBulk(void)
// TODO: Save the compressed data into a file for later analysis // TODO: Save the compressed data into a file for later analysis
COPY_TO_CLIENT(); COPY_TO_CLIENT();
Sleep(50);
return true; return true;
} }
@ -2219,7 +2229,9 @@ bool cConnection::HandleServerSpawnObjectVehicle(void)
m_ServerBuffer.ResetRead(); m_ServerBuffer.ResetRead();
m_ServerBuffer.ReadAll(Buffer); m_ServerBuffer.ReadAll(Buffer);
m_ServerBuffer.ResetRead(); m_ServerBuffer.ResetRead();
m_ServerBuffer.SkipRead(1); UInt32 PacketLen, PacketType;
m_ServerBuffer.ReadVarInt(PacketLen);
m_ServerBuffer.ReadVarInt(PacketType);
if (Buffer.size() > 128) if (Buffer.size() > 128)
{ {
// Only log up to 128 bytes // Only log up to 128 bytes