Skip to content

Import merged pull request from Master to Indev #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ORelio merged 5 commits into from
Oct 28, 2014
Merged

Import merged pull request from Master to Indev #50

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1225a29
Merge pull request #39 from ORelio/Indev
ORelio May 14, 2014
729ae47
Merge pull request #43 from ORelio/Indev
ORelio Sep 4, 2014
1c28270
Merge pull request #46 from ORelio/Indev
ORelio Oct 8, 2014
fef50a3
Handle the case where "name" exists twice in the result string, like …
Oct 24, 2014
86b6baf
Merge pull request #49 from corbanmailloux/master
ORelio Oct 28, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion MinecraftClient/Protocol/Handlers/Protocol17.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down