Removed unneeded temp login variable. Made server alias check conditional

This commit is contained in:
initsuj 2016-06-26 15:29:21 -07:00
parent 554aa358b5
commit aff1c04f2d

View file

@ -132,8 +132,7 @@ namespace MinecraftClient
{ {
try try
{ {
string serverIP = ""; string serverAlias = "";
string login = "";
string[] Lines = File.ReadAllLines(settingsfile); string[] Lines = File.ReadAllLines(settingsfile);
ParseMode pMode = ParseMode.Default; ParseMode pMode = ParseMode.Default;
foreach (string lineRAW in Lines) foreach (string lineRAW in Lines)
@ -174,9 +173,9 @@ namespace MinecraftClient
case ParseMode.Main: case ParseMode.Main:
switch (argName.ToLower()) switch (argName.ToLower())
{ {
case "login": login = argValue; Login = argValue; break; case "login": Login = argValue; break;
case "password": Password = argValue; break; case "password": Password = argValue; break;
case "serverip": serverIP = argValue; SetServerIP(argValue); break; case "serverip": if(!SetServerIP(argValue)) serverAlias = argValue; ; break;
case "singlecommand": SingleCommand = argValue; break; case "singlecommand": SingleCommand = argValue; break;
case "language": Language = argValue; break; case "language": Language = argValue; break;
case "consoletitle": ConsoleTitle = argValue; break; case "consoletitle": ConsoleTitle = argValue; break;
@ -228,7 +227,7 @@ namespace MinecraftClient
} }
//Try user value against aliases after load //Try user value against aliases after load
Settings.SetAccount(login); Settings.SetAccount(Login);
} }
break; break;
@ -257,7 +256,7 @@ namespace MinecraftClient
ServerPort = server_port_temp; ServerPort = server_port_temp;
//Try server value against aliases after load //Try server value against aliases after load
SetServerIP(serverIP); SetServerIP(serverAlias);
} }
break; break;