Better exception catching

- Better catch in proxy handler
- Better catch in StartClient (thx doranchak)

MinecraftClient/McTcpClient.cs

@@ -89,6 +89,7 @@ namespace MinecraftClient
 
         private void StartClient(string user, string uuid, string sessionID, string server_ip, ushort port, int protocolversion, bool singlecommand, string command)
         {
+            bool retry = false;
             this.sessionid = sessionID;
             this.uuid = uuid;
             this.username = user;
@@ -114,6 +115,8 @@ namespace MinecraftClient
                 handler = Protocol.ProtocolHandler.getProtocolHandler(client, protocolversion, this);
                 Console.WriteLine("Version is supported.\nLogging in...");
 
+                try
+                {
                     if (handler.Login())
                     {
                         if (singlecommand)
@@ -141,9 +144,21 @@ namespace MinecraftClient
                         }
                     }
                 }
+                catch (Exception e)
+                {
+                    ConsoleIO.WriteLineFormatted("§8" + e.Message);
+                    Console.WriteLine("Failed to join this server.");
+                    retry = true;
+                }
+            }
             catch (SocketException)
             {
                 Console.WriteLine("Failed to connect to this IP.");
+                retry = true;
+            }
+
+            if (retry)
+            {
                 if (AttemptsLeft > 0)
                 {
                     ChatBot.LogToConsole("Waiting 5 seconds (" + AttemptsLeft + " attempts left)...");
@@ -428,6 +443,10 @@ namespace MinecraftClient
 
         public void OnPlayerJoin(Guid uuid, string name)
         {
+            //Ignore TabListPlus placeholders
+            if (name.StartsWith("0000tab#"))
+                return;
+
             lock (onlinePlayers)
             {
                 onlinePlayers[uuid] = name;

MinecraftClient/Proxy/ProxyHandler.cs

@@ -57,12 +57,16 @@ namespace MinecraftClient.Proxy
                 }
                 else return new TcpClient(host, port);
             }
-            catch (ProxyException e)
+            catch (Exception e)
+            {
+                if (e is ProxyException || e is SocketException)
                 {
                     ConsoleIO.WriteLineFormatted("§8" + e.Message);
                     proxy = null;
                     return null;
                 }
+                else throw;   
+            }
         }
     }
 }