Sort more packets. Add version checks inside packets.

1 files changed, 14 insertions, 5 deletions

diff --git a/src/net/eathena/guildrecv.cpp b/src/net/eathena/guildrecv.cpp
index 7adfdfb27..ef49698ee 100644
--- a/src/net/eathena/guildrecv.cpp
+++ b/src/net/eathena/guildrecv.cpp
@@ -132,12 +132,21 @@ void GuildRecv::processGuildExpulsionList(Net::MessageIn &msg)
     if (length < 4)
         return;
 
-    const int count = (length - 4) / 64;
-
-    for (int i = 0; i < count; i++)
+    int count;
+    if (msg.getVersion() < 20100803)
+    {
+        count = (length - 4) / 64;
+        for (int i = 0; i < count; i++)
+        {
+            msg.readString(24, "name");
+            msg.readString(40, "message");
+        }
+    }
+    else
     {
-        msg.readString(24, "name");
-        msg.readString(40, "message");
+        count = (length - 4) / 40;
+        for (int i = 0; i < count; i++)
+            msg.readString(40, "message");
     }
 }