From 31f97608a7f93766d3223bd2874bcae5a5a2cac6 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Wed, 8 Jan 2014 11:45:55 +0100 Subject: ProtoProxy: Fixed EntityProperties packet parsing. The modifiers list is per-property, not per-packet. --- Tools/ProtoProxy/Connection.cpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Tools/ProtoProxy/Connection.cpp b/Tools/ProtoProxy/Connection.cpp index c4776949e..3b50afbdc 100644 --- a/Tools/ProtoProxy/Connection.cpp +++ b/Tools/ProtoProxy/Connection.cpp @@ -1484,17 +1484,16 @@ bool cConnection::HandleServerEntityProperties(void) HANDLE_SERVER_PACKET_READ(ReadBEUTF16String16, AString, Key); HANDLE_SERVER_PACKET_READ(ReadBEDouble, double, Value); Log(" \"%s\" = %f", Key.c_str(), Value); - } // for i - - HANDLE_SERVER_PACKET_READ(ReadBEShort, short, ListLength); - Log(" ListLength = %d", ListLength); - for (int i = 0; i < ListLength; i++) - { - HANDLE_SERVER_PACKET_READ(ReadBEInt64, Int64, UUIDHi); - HANDLE_SERVER_PACKET_READ(ReadBEInt64, Int64, UUIDLo); - HANDLE_SERVER_PACKET_READ(ReadBEDouble, double, DblVal); - HANDLE_SERVER_PACKET_READ(ReadByte, Byte, ByteVal); - Log(" [%d] = {0x%08llx%08llx, %f, %i}", i, UUIDHi, UUIDLo, DblVal, ByteVal); + HANDLE_SERVER_PACKET_READ(ReadBEShort, short, ListLength); + Log(" ListLength = %d", ListLength); + for (int j = 0; j < ListLength; j++) + { + HANDLE_SERVER_PACKET_READ(ReadBEInt64, Int64, UUIDHi); + HANDLE_SERVER_PACKET_READ(ReadBEInt64, Int64, UUIDLo); + HANDLE_SERVER_PACKET_READ(ReadBEDouble, double, DblVal); + HANDLE_SERVER_PACKET_READ(ReadByte, Byte, ByteVal); + Log(" [%d] = {0x%08llx%08llx, %f, %i}", j, UUIDHi, UUIDLo, DblVal, ByteVal); + } // for j } // for i COPY_TO_CLIENT(); return true; -- cgit v1.2.3