servergreps: fix detecting preffered packets if packet defined more than once.

1 files changed, 4 insertions, 1 deletions

diff --git a/servergreps/hercules/packets.py b/servergreps/hercules/packets.py
index 3647abd..f3d0e0b 100755
--- a/servergreps/hercules/packets.py
+++ b/servergreps/hercules/packets.py
@@ -32,6 +32,7 @@ sizes = dict()
 manaplusUsedPacketsSet = set()
 namedPackets = dict()
 serverFunctionToId = dict()
+outMsgNameToId = dict()
 
 def addServerPacket(data):
     if data in namedPackets:
@@ -133,6 +134,7 @@ def collectManaPlusOutPackets(fileName, packetVersion):
                     continue
                 clientPacketsManaPlus[m.group("packet").lower()] = (m.group("name"), int(m.group("len")), m.group("function"))
                 clientPacketsManaPlusClient[m.group("packet").lower()] = (m.group("name"), int(m.group("len")), m.group("function"))
+                outMsgNameToId[m.group("name")] = m.group("packet").lower()
 
 def collectClientPackets(fileName):
     with open(fileName, "r") as f:
@@ -318,7 +320,8 @@ def printPackets(packetDir):
 
     rev = []
     with open(packetDir + "/clientpreferredpackets.txt", "w") as w:
-        for packet in clientPacketsManaPlusClient:
+        for name in outMsgNameToId:
+            packet = outMsgNameToId[name]
             if packet in clientPackets:
                 packet1 = clientPacketsManaPlusClient[packet]
                 packet2 = clientPackets[packet]