Merge github.com:conde2/otclient

modules/gamelib/protocollogin.lua

@@ -135,6 +135,33 @@ end
 
 function ProtocolLogin:parseCharacterList(msg)
   local characters = {}
+
+  if g_game.getProtocolVersion() > 1010 then
+    local worlds = {}
+
+    local worldsCount = msg:getU8()
+    for i=1, worldsCount do
+      local world = {}
+      local worldId = msg:getU8() 
+      world.worldName = msg:getString()
+      world.worldIp = msg:getString()
+      world.worldPort = msg:getU16()
+      msg:getU8() -- unknow byte?
+      worlds[worldId] = world
+    end
+
+    local charactersCount = msg:getU8()
+    for i=1, charactersCount do
+      local character = {}
+      local worldId = msg:getU8()
+      character.name = msg:getString()
+      character.worldName = worlds[worldId].worldName
+      character.worldIp = worlds[worldId].worldIp
+      character.worldPort = worlds[worldId].worldPort
+      characters[i] = character
+    end
+
+  else
     local charactersCount = msg:getU8()
     for i=1,charactersCount do
       local character = {}
@@ -149,6 +176,7 @@ function ProtocolLogin:parseCharacterList(msg)
 
       characters[i] = character
     end
+  end
 
   local account = {}
   account.premDays = msg:getU16()