From be2074b4f00983489cbb33e69394e4a147686af5 Mon Sep 17 00:00:00 2001
From: juanjp600 <juanjprot@gmail.com>
Date: Thu, 22 Jun 2017 19:51:19 -0300
Subject: [PATCH] Added some convenient console commands

---
 BarotraumaServer/Source/DebugConsole.cs       | 24 ++++++++++++
 BarotraumaServer/Source/GameMain.cs           | 39 ++++++++++++++-----
 BarotraumaServer/Source/Program.cs            |  5 ++-
 BarotraumaShared/Source/DebugConsole.cs       | 31 +++++++++++----
 .../Source/Networking/GameServer.cs           |  9 ++++-
 BarotraumaShared/Source/Screens/Screen.cs     |  5 +++
 6 files changed, 93 insertions(+), 20 deletions(-)

diff --git a/BarotraumaServer/Source/DebugConsole.cs b/BarotraumaServer/Source/DebugConsole.cs
index 4bca6e98e..b61ec7df7 100644
--- a/BarotraumaServer/Source/DebugConsole.cs
+++ b/BarotraumaServer/Source/DebugConsole.cs
@@ -31,6 +31,30 @@ namespace Barotrauma
         {
             switch (commands[0].ToLower())
             {
+                case "restart":
+                case "reset":
+                    DebugConsole.NewMessage("*****************", Color.Lime);
+                    DebugConsole.NewMessage("RESTARTING SERVER", Color.Lime);
+                    DebugConsole.NewMessage("*****************", Color.Lime);
+                    GameMain.Instance.CloseServer();
+                    GameMain.Instance.StartServer();
+                    break;
+                case "exit":
+                case "close":
+                case "quit":
+                    GameMain.ShouldRun = false;
+                    break;
+                case "say":
+                case "msg":
+                    string text = "";
+                    for (int i=1;i<commands.Count();i++)
+                    {
+                        if (!string.IsNullOrEmpty(text)) text += " ";
+                        text += commands[i];
+                    }
+                    if (commands[0].ToLower() == "say") text = "HOST: " + text;
+                    GameMain.Server.SendChatMessage(text, ChatMessageType.Server);
+                    break;
                 case "startgame":
                 case "startround":
                 case "start":
diff --git a/BarotraumaServer/Source/GameMain.cs b/BarotraumaServer/Source/GameMain.cs
index 4a3a4a2e5..066f69790 100644
--- a/BarotraumaServer/Source/GameMain.cs
+++ b/BarotraumaServer/Source/GameMain.cs
@@ -48,6 +48,7 @@ namespace Barotrauma
         public static readonly Screen EditCharacterScreen = UnimplementedScreen.Instance;
 
         //
+        public static bool ShouldRun = true;
 
         public static ContentPackage SelectedPackage
         {
@@ -75,13 +76,8 @@ namespace Barotrauma
             GameScreen = new GameScreen();
         }
 
-        public void Run()
+        public void Init()
         {
-            Hyper.ComponentModel.HyperTypeDescriptionProvider.Add(typeof(Character));
-            Hyper.ComponentModel.HyperTypeDescriptionProvider.Add(typeof(Item));
-            Hyper.ComponentModel.HyperTypeDescriptionProvider.Add(typeof(Items.Components.ItemComponent));
-            Hyper.ComponentModel.HyperTypeDescriptionProvider.Add(typeof(Hull));
-            
             Mission.Init();
             MapEntityPrefab.Init();
             LevelGenerationParams.LoadPresets();
@@ -96,14 +92,36 @@ namespace Barotrauma
             LocationType.Init();
 
             Submarine.RefreshSavedSubs();
-            
-            NetLobbyScreen = new NetLobbyScreen();
 
+            Screen.SelectNull();
+
+            NetLobbyScreen = new NetLobbyScreen();
+        }
+
+        public void StartServer()
+        {
             Server = new GameServer("Dedicated Server Test", 14242, false, "asd", false, 10);
+        }
+
+        public void CloseServer()
+        {
+            Server.Disconnect();
+            Server = null;
+        }
+
+        public void Run()
+        {
+            Hyper.ComponentModel.HyperTypeDescriptionProvider.Add(typeof(Character));
+            Hyper.ComponentModel.HyperTypeDescriptionProvider.Add(typeof(Item));
+            Hyper.ComponentModel.HyperTypeDescriptionProvider.Add(typeof(Items.Components.ItemComponent));
+            Hyper.ComponentModel.HyperTypeDescriptionProvider.Add(typeof(Hull));
+
+            Init();
+            StartServer();
 
             DateTime prevTime = DateTime.Now;
 
-            while (true)
+            while (ShouldRun)
             {
                 prevTime = DateTime.Now;
 
@@ -115,6 +133,9 @@ namespace Barotrauma
                 int frameTime = DateTime.Now.Subtract(prevTime).Milliseconds;
                 Thread.Sleep(Math.Max((int)(Timing.Step * 1000.0) - frameTime,0));
             }
+
+            CloseServer();
+
         }
         
         public void ProcessInput()
diff --git a/BarotraumaServer/Source/Program.cs b/BarotraumaServer/Source/Program.cs
index 3aaf2dd16..6fbb23630 100644
--- a/BarotraumaServer/Source/Program.cs
+++ b/BarotraumaServer/Source/Program.cs
@@ -30,18 +30,19 @@ namespace Barotrauma
         {
             GameMain game = null;
             Thread inputThread = null;
+            
             try
             {
                 game = new GameMain();
-
                 inputThread = new Thread(new ThreadStart(game.ProcessInput));
                 inputThread.Start();
                 game.Run();
+                inputThread.Abort(); inputThread.Join();
             }
             catch (Exception e)
             {
                 CrashDump(game, "servercrashreport.txt", e);
-                //inputThread.Abort(); inputThread.Join();
+                inputThread.Abort(); inputThread.Join();
             }
         }
         
diff --git a/BarotraumaShared/Source/DebugConsole.cs b/BarotraumaShared/Source/DebugConsole.cs
index 1b449ceac..53b5904c8 100644
--- a/BarotraumaShared/Source/DebugConsole.cs
+++ b/BarotraumaShared/Source/DebugConsole.cs
@@ -91,16 +91,14 @@ namespace Barotrauma
 
             switch (commands[0].ToLowerInvariant())
             {
-                case "entitylist":
-                    System.IO.StreamWriter sw = new System.IO.StreamWriter("ENTLIST "+Rand.Int(20000).ToString()+".TXT");
-
-                    List<Entity> entList = Entity.GetEntityList();
-                    foreach (Entity ent in entList)
+                case "clientlist":
+                    if (GameMain.Server == null) break;
+                    DebugConsole.NewMessage("***************", Color.Cyan);
+                    foreach (Client c in GameMain.Server.ConnectedClients)
                     {
-                        sw.WriteLine(ent.ID.ToString()+" "+ent.ToString());
+                        DebugConsole.NewMessage("- " + c.ID.ToString() + ": " + c.name + ", " + c.Connection.RemoteEndPoint.Address.ToString(),Color.Cyan);
                     }
-
-                    sw.Close();
+                    DebugConsole.NewMessage("***************", Color.Cyan);
                     break;
                 case "help":
                     NewMessage("menu: go to main menu", Color.Cyan);
@@ -308,6 +306,23 @@ namespace Barotrauma
                     if (GameMain.NetworkMember == null || commands.Length < 2) break;
                     GameMain.NetworkMember.KickPlayer(string.Join(" ", commands.Skip(1)), false);
 
+                    break;
+                case "kickid":
+                    if (GameMain.Server == null || commands.Length < 2) break;
+                    {
+                        int id = 0;
+                        int.TryParse(commands[1], out id);
+                        GameMain.Server.KickPlayer(id, false);
+                    }
+                    break;
+                case "banid":
+                    if (GameMain.Server == null || commands.Length < 2) break;
+                    {
+                        int id = 0;
+                        int.TryParse(commands[1], out id);
+                        GameMain.Server.KickPlayer(id, true);
+                    }
+
                     break;
                 case "ban":
                     if (GameMain.NetworkMember == null || commands.Length < 2) break;
diff --git a/BarotraumaShared/Source/Networking/GameServer.cs b/BarotraumaShared/Source/Networking/GameServer.cs
index 3e9889059..9b1d48f3e 100644
--- a/BarotraumaShared/Source/Networking/GameServer.cs
+++ b/BarotraumaShared/Source/Networking/GameServer.cs
@@ -1249,7 +1249,7 @@ namespace Barotrauma.Networking
             GameMain.GameScreen.Select();
 
             AddChatMessage("Press TAB to chat. Use \"r;\" to talk through the radio.", ChatMessageType.Server);
-            
+
             GameMain.NetLobbyScreen.StartButtonEnabled = true;
 
             gameStarted = true;
@@ -1411,6 +1411,13 @@ namespace Barotrauma.Networking
             KickClient(client, ban, range);
         }
 
+        public void KickPlayer(int id,bool ban,bool range=false)
+        {
+            Client client = connectedClients.Find(c => c.ID == id);
+
+            KickClient(client, ban, range);
+        }
+
         public void KickClient(NetConnection conn, bool ban = false, bool range = false)
         {
             Client client = connectedClients.Find(c => c.Connection == conn);
diff --git a/BarotraumaShared/Source/Screens/Screen.cs b/BarotraumaShared/Source/Screens/Screen.cs
index 3722a3364..8e96b37d0 100644
--- a/BarotraumaShared/Source/Screens/Screen.cs
+++ b/BarotraumaShared/Source/Screens/Screen.cs
@@ -14,6 +14,11 @@ namespace Barotrauma
             get { return selected; }
         }
 
+        public static void SelectNull()
+        {
+            selected = null;
+        }
+
         public virtual void Deselect()
         {
         }