From b90466447f7efa7f8805e600ef138545fb36e979 Mon Sep 17 00:00:00 2001 From: Lauchlin Date: Wed, 5 Nov 2014 01:59:32 +1100 Subject: [PATCH] Use usigned short to cover full range of ports Each side of a TCP connection has an associated 16-bit unsigned port number (0-65535). Use an unsigned short rather than a signed short otherwise you'll only get half the ports! --- MinecraftClient/Settings.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/MinecraftClient/Settings.cs b/MinecraftClient/Settings.cs index 6ccbe85e..03f14f9c 100644 --- a/MinecraftClient/Settings.cs +++ b/MinecraftClient/Settings.cs @@ -20,7 +20,7 @@ namespace MinecraftClient public static string Username = ""; public static string Password = ""; public static string ServerIP = ""; - public static short ServerPort = 25565; + public static unsigned short 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 AppVars = new Dictionary(); private static Dictionary> Accounts = new Dictionary>(); - private static Dictionary> Servers = new Dictionary>(); + private static Dictionary> Servers = new Dictionary>(); 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; - short server_port_temp = ServerPort; + unsigned short 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(ServerIP, ServerPort); + = new KeyValuePair(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; + unsigned short port = 25565; if (sip.Length > 1) { try { - port = Convert.ToInt16(sip[1]); + port = Convert.ToUInt16(sip[1]); } catch (FormatException) { return false; } }