From f1edb14f3f6e1b84b53ee7675ec97aafa3fd17fd Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Sun, 16 Jul 2017 16:50:02 +0300
Subject: [PATCH] "Spawning" serverlog message type, more informative respawn
 logging

---
 .../Source/Networking/RespawnManager.cs           | 15 +++++++++------
 .../Source/Networking/ServerLog.cs                |  3 +++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/Barotrauma/BarotraumaShared/Source/Networking/RespawnManager.cs b/Barotrauma/BarotraumaShared/Source/Networking/RespawnManager.cs
index 37ec34a9a..ecbb192f6 100644
--- a/Barotrauma/BarotraumaShared/Source/Networking/RespawnManager.cs
+++ b/Barotrauma/BarotraumaShared/Source/Networking/RespawnManager.cs
@@ -268,7 +268,7 @@ namespace Barotrauma.Networking
                     ResetShuttle();
 
                     state = State.Waiting;
-                    GameServer.Log("The respawn shuttle has left.", ServerLog.MessageType.ServerMessage);
+                    GameServer.Log("The respawn shuttle has left.", ServerLog.MessageType.Spawning);
                     server.CreateEntityEvent(this);
 
                     respawnTimer = respawnInterval;
@@ -289,7 +289,7 @@ namespace Barotrauma.Networking
 
             shuttleSteering.TargetVelocity = Vector2.Zero;
 
-            GameServer.Log("Dispatching the respawn shuttle.", ServerLog.MessageType.ServerMessage);
+            GameServer.Log("Dispatching the respawn shuttle.", ServerLog.MessageType.Spawning);
 
             RespawnCharacters();
 
@@ -404,9 +404,10 @@ namespace Barotrauma.Networking
             }
 
             List<CharacterInfo> characterInfos = clients.Select(c => c.characterInfo).ToList();
-            if (server.Character != null && server.Character.IsDead) characterInfos.Add(server.CharacterInfo);
-
-            GameServer.Log("Respawning characters: "+string.Join(", ", characterInfos.Select(ci => ci.Name)), ServerLog.MessageType.ServerMessage);
+            if (server.Character != null && server.Character.IsDead)
+            {
+                characterInfos.Add(server.CharacterInfo);
+            }
 
             server.AssignJobs(clients, server.Character != null && server.Character.IsDead);
             foreach (Client c in clients)
@@ -445,12 +446,14 @@ namespace Barotrauma.Networking
                     Character.Controlled = character;
 
                     GameMain.LightManager.LosEnabled = true;
-
+                    GameServer.Log(string.Format("Respawning {0} (host) as {1}", character.Name, characterInfos[i].Job.Name), ServerLog.MessageType.Spawning);
                 }
                 else
                 {
 #endif
                     clients[i].Character = character;
+                    GameServer.Log(string.Format("Respawning {0} ({1}) as {2}", clients[i].name, clients[i].Connection?.RemoteEndPoint?.Address, characterInfos[i].Job.Name), ServerLog.MessageType.Spawning);
+
 #if CLIENT
                 }
 #endif
diff --git a/Barotrauma/BarotraumaShared/Source/Networking/ServerLog.cs b/Barotrauma/BarotraumaShared/Source/Networking/ServerLog.cs
index d7047060f..75c01d533 100644
--- a/Barotrauma/BarotraumaShared/Source/Networking/ServerLog.cs
+++ b/Barotrauma/BarotraumaShared/Source/Networking/ServerLog.cs
@@ -26,6 +26,7 @@ namespace Barotrauma.Networking
             ItemInteraction,
             Inventory,
             Attack,
+            Spawning,
             ServerMessage,
             Error
         }
@@ -36,6 +37,7 @@ namespace Barotrauma.Networking
             new Color(255, 142, 0),
             new Color(238, 208, 0),
             new Color(204, 74, 78),
+            new Color(163, 73, 164),
             new Color(157, 225, 160),
             Color.Red
         };
@@ -46,6 +48,7 @@ namespace Barotrauma.Networking
             "Item interaction",
             "Inventory usage",
             "Attack & death",
+            "Spawning",
             "Server message",
             "Error"
         };