Merge pull request #105 from koliva8245/battlelobby

Updated to handle internal id better (T: and TOON)
barrett777 · Feb 4, 2020 · 3b157d8 · 3b157d8
2 parents 72a91cd + 6002aec
commit 3b157d8
Showing 1 changed file with 3 additions and 10 deletions.
diff --git a/Heroes.ReplayParser/MPQFiles/ReplayServerBattlelobby.cs b/Heroes.ReplayParser/MPQFiles/ReplayServerBattlelobby.cs
@@ -157,12 +157,8 @@ private static void DetailedParse(BitReader bitReader, Replay replay, uint s2maC
                     throw new DetailedParsedException("Not Hero");
                 bitReader.Read(32); // m_realm
 
-                int idLength = (int)bitReader.Read(7);
-
+                int idLength = (int)bitReader.Read(7) + 2;
                 bitReader.AlignToByte();
-                if (bitReader.ReadString(2) != "T:")
-                    throw new DetailedParsedException("Not T:");
-
                 replay.ClientListByUserID[i].BattleNetTId = bitReader.ReadString(idLength);
 
                 bitReader.Read(6);
@@ -175,13 +171,10 @@ private static void DetailedParse(BitReader bitReader, Replay replay, uint s2maC
                         throw new DetailedParsedException("Not Hero");
                     bitReader.Read(32); // m_realm
 
-                    idLength = (int)bitReader.Read(7);
+                    idLength = (int)bitReader.Read(7) + 2;
                     bitReader.AlignToByte();
-                    if (bitReader.ReadString(2) != "T:")
-                        throw new DetailedParsedException("Not T: (duplicate)");
-
                     if (replay.ClientListByUserID[i].BattleNetTId != bitReader.ReadString(idLength))
-                        throw new DetailedParsedException("Duplicate TID does not match");
+                        throw new DetailedParsedException("Duplicate internal id does not match");
                 }
 
                 bitReader.Read(2);