From efab25a36e4689f96906d24450c9bd8fd55f17e6 Mon Sep 17 00:00:00 2001
From: Zontreck <tarapiccari@gmail.com>
Date: Tue, 10 Mar 2020 15:18:29 -0700
Subject: [PATCH] fix small issues

---
 CommandSystem/CommandManager.cs |  1 +
 NonCommands/nRegistry.cs        | 23 +++++++++++++++--------
 Program.cs                      | 26 ++++++++++++++++----------
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/CommandSystem/CommandManager.cs b/CommandSystem/CommandManager.cs
index 7955cab..f45a98a 100644
--- a/CommandSystem/CommandManager.cs
+++ b/CommandSystem/CommandManager.cs
@@ -61,6 +61,7 @@ namespace Bot.CommandSystem
             if (parameters.type == "chat") sourceLoc = MessageHandler.Destinations.DEST_LOCAL;
             else if (parameters.type == "group") sourceLoc = MessageHandler.Destinations.DEST_GROUP;
             else if (parameters.type == "im") sourceLoc = MessageHandler.Destinations.DEST_AGENT;
+            else if (parameters.type == "console") sourceLoc = MessageHandler.Destinations.DEST_CONSOLE_INFO;
             else sourceLoc = MessageHandler.Destinations.DEST_LOCAL;
 
             string agentName = parameters.fromName;
diff --git a/NonCommands/nRegistry.cs b/NonCommands/nRegistry.cs
index 9336906..4519bca 100644
--- a/NonCommands/nRegistry.cs
+++ b/NonCommands/nRegistry.cs
@@ -19,19 +19,26 @@ namespace Bot.NonCommands
                 {
                     if (t.IsClass)
                     {
-                        foreach (NotCommand NC in (NotCommand[])t.GetCustomAttributes(false))
+                        try
                         {
-                            MethodInfo mi = t.GetMethod("handle");
 
-                            ThreadStart work = delegate
+                            foreach (NotCommand NC in (NotCommand[])t.GetCustomAttributes(false))
                             {
-                                mi.Invoke(Activator.CreateInstance(mi.DeclaringType), new object[] { request, agentKey, agentName, sourceLoc, originator });
-                            };
-                            Thread T = new Thread(work);
+                                MethodInfo mi = t.GetMethod("handle");
+
+                                ThreadStart work = delegate
+                                {
+                                    mi.Invoke(Activator.CreateInstance(mi.DeclaringType), new object[] { request, agentKey, agentName, sourceLoc, originator });
+                                };
+                                Thread T = new Thread(work);
 
 
-                               // _mi.Invoke(Activator.CreateInstance(_mi.DeclaringType), new object[] {  });
-                            T.Start();
+                                // _mi.Invoke(Activator.CreateInstance(_mi.DeclaringType), new object[] {  });
+                                T.Start();
+                            }
+                        }catch(Exception e)
+                        {
+
                         }
                     }
                 }
diff --git a/Program.cs b/Program.cs
index ace0494..ba97a8f 100644
--- a/Program.cs
+++ b/Program.cs
@@ -165,18 +165,18 @@ namespace Bot
             string fna = null;
             string lna = null;
             string pwd = null;
-            if (conf.first == null)
+            if (conf.first == null || conf.first == "")
             {
 
                 if (args.Length == 0)
                 {
 
-                    Log.info(true, "Please enter your avatar's first name:  ");
+                    Log.info(false, "Please enter your avatar's first name:  ");
                     fna = Console.ReadLine();
 
-                    Log.info(true, "Please enter the last name: ");
+                    Log.info(false, "Please enter the last name: ");
                     lna = Console.ReadLine();
-                    Log.info(true, "Now enter your password: ");
+                    Log.info(false, "Now enter your password: ");
                     pwd = Console.ReadLine();
 
                     conf.MainProgramDLL = DefaultProgram;
@@ -186,8 +186,8 @@ namespace Bot
                 }
                 else
                 {
-                    Log.info(true, "Loading...");
-                    Log.info(true, "FirstName: " + args[0]);
+                    Log.info(false, "Loading...");
+                    Log.info(false, "FirstName: " + args[0]);
                     fna = args[0];
                     lna = args[1];
                     pwd = args[2];
@@ -288,8 +288,14 @@ namespace Bot
                         default:
                             {
                                 // Run command!
-                                MessageHandler.Destinations src = MessageHandler.Destinations.DEST_CONSOLE_INFO;
-
+                                Dictionary<string, string> argsx = new Dictionary<string, string>();
+                                argsx.Add("type", "console");
+                                argsx.Add("source", "null");
+                                argsx.Add("request", consoleCmd);
+                                argsx.Add("from", "");
+                                argsx.Add("from_sess", "");
+                                argsx.Add("fromName", "CONSOLE");
+                                passArguments(JsonConvert.SerializeObject(argsx));
                                 break;
                             }
                     }
@@ -509,10 +515,10 @@ namespace Bot
                     //}
                 }
 
-                prompter.Abort();
+                prompter.Interrupt();
                 client.Network.Logout();
             }
-
+            while (client.Network.Connected) { }
             Environment.Exit(0);
 
             //System.Console.WriteLine("PAUSING. PRESS ANY KEY TO EXIT");