Merge pull request #50 from ORelio/master

Import merged pull request from Master to Indev
MCCTeam · Oct 28, 2014 · f0f8183 · f0f8183
2 parents 531aede + 86b6baf
commit f0f8183
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/MinecraftClient/Protocol/Handlers/Protocol17.cs b/MinecraftClient/Protocol/Handlers/Protocol17.cs
@@ -544,7 +544,9 @@ public static bool doPing(string host, int port, ref int protocolversion)
                         if (tmp_ver.Length >= 2 && tmp_name.Length >= 2)
                         {
                             protocolversion = atoi(tmp_ver[1]);
-                            version = tmp_name[1].Split('"')[0];
+
+                            // Handle if "name" exists twice, like when connecting to a server with another user logged in.
+                            version = (tmp_name.Length == 2) ? tmp_name[1].Split('"')[0] : tmp_name[2].Split('"')[0];
                             if (result.Contains("modinfo\":"))
                             {
                                 //Server is running Forge (which is not supported)