helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-11-07 17:36:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into Indev

Browse source 
Conflicts:
	MinecraftClient/McTcpClient.cs
	MinecraftClient/Protocol/ProtocolHandler.cs
	MinecraftClient/Settings.cs
This commit is contained in:
lokulin 2014-11-06 20:31:31 +11:00
commit 5c8c3f42ed
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MinecraftClient/Protocol/ProtocolHandler.cs
View file

@ -23,7 +23,7 @@ namespace MinecraftClient.Protocol
/// <param name="protocolversion">Will contain protocol version, if ping successful</param>
/// <returns>TRUE if ping was successful</returns>
public static bool GetServerInfo(string serverIP, int serverPort, ref int protocolversion)
public static bool GetServerInfo(string serverIP, ushort serverPort, ref int protocolversion)
{
try
{