vlad.os/LuaCsForBarotraumaEP
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

"Spawning" serverlog message type, more informative respawn logging

Browse Source
This commit is contained in:
Joonas Rikkonen
2017-07-16 16:50:02 +03:00
parent 50fc576840
commit f1edb14f3f
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Barotrauma/BarotraumaShared/Source/Networking/RespawnManager.cs
View File

@@ -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

3
Barotrauma/BarotraumaShared/Source/Networking/ServerLog.cs
View File

@@ -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"
};