From c8332eb8457bef7b3c64a1275e210e124cfe71ab Mon Sep 17 00:00:00 2001
From: ORelio <oreliogitantispam.l0gin@spamgourmet.com>
Date: Sat, 31 May 2014 12:56:54 +0200
Subject: [PATCH] Add 'exit on failure' setting

- Automatically close on connection lost or other failure
- Feature suggested by TorchRJ_
- Also, forgot to mention in 'App refactoring almost done' :
- Issue depending on username and/or server should be fixed
---
 MinecraftClient/McTcpClient.cs |  3 +--
 MinecraftClient/Program.cs     | 12 ++++++++----
 MinecraftClient/Settings.cs    |  3 +++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/MinecraftClient/McTcpClient.cs b/MinecraftClient/McTcpClient.cs
index ba48a006..c0f4a30f 100644
--- a/MinecraftClient/McTcpClient.cs
+++ b/MinecraftClient/McTcpClient.cs
@@ -113,8 +113,7 @@ namespace MinecraftClient
                 client = ProxyHandler.newTcpClient(host, port);
                 client.ReceiveBufferSize = 1024 * 1024;
                 handler = Protocol.ProtocolHandler.getProtocolHandler(client, protocolversion, this);
-                Console.WriteLine("Version is supported.");
-                Console.WriteLine("Logging in...");
+                Console.WriteLine("Version is supported.\nLogging in...");
                 
                 if (handler.Login())
                 {
diff --git a/MinecraftClient/Program.cs b/MinecraftClient/Program.cs
index b88e66c9..943cdd93 100644
--- a/MinecraftClient/Program.cs
+++ b/MinecraftClient/Program.cs
@@ -218,11 +218,15 @@ namespace MinecraftClient
 
         public static bool ReadLineReconnect()
         {
-            string text = Console.ReadLine();
-            if (text == "reco" || text == "reconnect" || text == "/reco" || text == "/reconnect")
+            if (!Settings.exitOnFailure)
             {
-                Program.Restart();
-                return true;
+                string text = Console.ReadLine();
+                if (text == "reco" || text == "reconnect" || text == "/reco" || text == "/reconnect")
+                {
+                    Program.Restart();
+                    return true;
+                }
+                else return false;
             }
             else return false;
         }
diff --git a/MinecraftClient/Settings.cs b/MinecraftClient/Settings.cs
index a1e51a02..3cbd5de2 100644
--- a/MinecraftClient/Settings.cs
+++ b/MinecraftClient/Settings.cs
@@ -38,6 +38,7 @@ namespace MinecraftClient
         public static List<string> Bots_Owners = new List<string>();
         public static string Language = "en_GB";
         public static bool chatTimeStamps = false;
+        public static bool exitOnFailure = false;
 
         //AntiAFK Settings
         public static bool AntiAFK_Enabled = false;
@@ -134,6 +135,7 @@ namespace MinecraftClient
                                                 case "language": Language = argValue; break;
                                                 case "consoletitle": ConsoleTitle = argValue; break;
                                                 case "timestamps": chatTimeStamps = str2bool(argValue); break;
+                                                case "exitonfailure": exitOnFailure = str2bool(argValue); break;
                                                 case "botowners":
                                                     Bots_Owners.Clear();
                                                     foreach (string name in argValue.ToLower().Replace(" ", "").Split(','))
@@ -258,6 +260,7 @@ namespace MinecraftClient
                 + "language=en_GB\r\n"
                 + "botowners=Player1,Player2,Player3\r\n"
                 + "consoletitle=%username% - Minecraft Console Client\r\n"
+                + "exitonfailure=false\r\n"
                 + "timestamps=false\r\n"
                 + "\r\n"
                 + "[Proxy]\r\n"