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 pull request #53 from lokulin/Indev

Browse source 
Merging pull request
This commit is contained in:
ORelio 2014-11-06 19:10:15 +01:00
commit 157aa2a786
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
MinecraftClient/McTcpClient.cs
View file

@ -53,7 +53,7 @@ namespace MinecraftClient
/// <param name="port">The server port to use</param>
/// <param name="protocolversion">Minecraft protocol version to use</param>
public McTcpClient(string username, string uuid, string sessionID, int protocolversion, string server_ip, int port)
public McTcpClient(string username, string uuid, string sessionID, int protocolversion, string server_ip, ushort port)
{
StartClient(username, uuid, sessionID, server_ip, port, protocolversion, false, "");
}
@ -69,7 +69,7 @@ namespace MinecraftClient
/// <param name="protocolversion">Minecraft protocol version to use</param>
/// <param name="command">The text or command to send.</param>
public McTcpClient(string username, string uuid, string sessionID, string server_ip, int port, int protocolversion, string command)
public McTcpClient(string username, string uuid, string sessionID, string server_ip, ushort port, int protocolversion, string command)
{
StartClient(username, uuid, sessionID, server_ip, port, protocolversion, true, command);
}
@ -86,7 +86,7 @@ namespace MinecraftClient
/// <param name="singlecommand">If set to true, the client will send a single command and then disconnect from the server</param>
/// <param name="command">The text or command to send. Will only be sent if singlecommand is set to true.</param>
private void StartClient(string user, string uuid, string sessionID, string server_ip, int port, int protocolversion, bool singlecommand, string command)
private void StartClient(string user, string uuid, string sessionID, string server_ip, ushort port, int protocolversion, bool singlecommand, string command)
{
this.sessionid = sessionID;
this.uuid = uuid;

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
{

12
MinecraftClient/Settings.cs
View file

@ -20,7 +20,7 @@ namespace MinecraftClient
public static string Username = "";
public static string Password = "";
public static string ServerIP = "";
public static int ServerPort = 25565;
public static ushort ServerPort = 25565;
public static string ServerVersion = "";
public static string SingleCommand = "";
public static string ConsoleTitle = "";
@ -90,7 +90,7 @@ namespace MinecraftClient
//Custom app variables and Minecraft accounts
private static Dictionary<string, string> AppVars = new Dictionary<string, string>();
private static Dictionary<string, KeyValuePair<string, string>> Accounts = new Dictionary<string, KeyValuePair<string, string>>();
private static Dictionary<string, KeyValuePair<string, int>> Servers = new Dictionary<string, KeyValuePair<string, int>>();
private static Dictionary<string, KeyValuePair<string, ushort>> Servers = new Dictionary<string, KeyValuePair<string, ushort>>();
private enum ParseMode { Default, Main, AppVars, Proxy, AntiAFK, Hangman, Alerts, ChatLog, AutoRelog, ScriptScheduler, RemoteControl };
@ -186,7 +186,7 @@ namespace MinecraftClient
{
//Backup current server info
string server_host_temp = ServerIP;
int server_port_temp = ServerPort;
ushort server_port_temp = ServerPort;
foreach (string server_line in File.ReadAllLines(argValue))
{
@ -198,7 +198,7 @@ namespace MinecraftClient
&& !server_data[0].Contains('.')
&& setServerIP(server_data[1]))
Servers[server_data[0]]
= new KeyValuePair<string, int>(ServerIP, ServerPort);
= new KeyValuePair<string, ushort>(ServerIP, ServerPort);
}
//Restore current server info
@ -432,13 +432,13 @@ namespace MinecraftClient
server = server.ToLower();
string[] sip = server.Split(':');
string host = sip[0];
short port = 25565;
ushort port = 25565;
if (sip.Length > 1)
{
try
{
port = Convert.ToInt16(sip[1]);
port = Convert.ToUInt16(sip[1]);
}
catch (FormatException) { return false; }
}