From 554aa358b57c998be1b49d5943f35d2dfa814dfb Mon Sep 17 00:00:00 2001 From: initsuj Date: Sun, 26 Jun 2016 14:27:04 -0700 Subject: [PATCH] Attempt to expand user and server aliases after accounts.txt and servers.txt file loaded. --- MinecraftClient/Settings.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/MinecraftClient/Settings.cs b/MinecraftClient/Settings.cs index d72f6469..952daa4c 100644 --- a/MinecraftClient/Settings.cs +++ b/MinecraftClient/Settings.cs @@ -132,6 +132,8 @@ namespace MinecraftClient { try { + string serverIP = ""; + string login = ""; string[] Lines = File.ReadAllLines(settingsfile); ParseMode pMode = ParseMode.Default; foreach (string lineRAW in Lines) @@ -172,9 +174,9 @@ namespace MinecraftClient case ParseMode.Main: switch (argName.ToLower()) { - case "login": Login = argValue; break; + case "login": login = argValue; Login = argValue; break; case "password": Password = argValue; break; - case "serverip": SetServerIP(argValue); break; + case "serverip": serverIP = argValue; SetServerIP(argValue); break; case "singlecommand": SingleCommand = argValue; break; case "language": Language = argValue; break; case "consoletitle": ConsoleTitle = argValue; break; @@ -224,6 +226,9 @@ namespace MinecraftClient Accounts[account_data[0].ToLower()] = new KeyValuePair(account_data[1], account_data[2]); } + + //Try user value against aliases after load + Settings.SetAccount(login); } break; @@ -250,6 +255,9 @@ namespace MinecraftClient //Restore current server info ServerIP = server_host_temp; ServerPort = server_port_temp; + + //Try server value against aliases after load + SetServerIP(serverIP); } break;