5202af9...3ea33fb

This commit is contained in:
Joonas Rikkonen
2019-03-18 21:46:09 +02:00
parent 044fd3344b
commit 97f31d0c94
61 changed files with 2585 additions and 558 deletions
@@ -40,16 +40,19 @@ namespace Barotrauma.Networking
{
get
{
if (!Type.HasFlag(ChatMessageType.Server | ChatMessageType.Error))
if (Type.HasFlag(ChatMessageType.Server) || Type.HasFlag(ChatMessageType.Error) || Type.HasFlag(ChatMessageType.ServerLog))
{
if (translatedText == null || translatedText.Length == 0)
{
translatedText = TextManager.GetServerMessage(Text);
}
return translatedText;
}
else
{
return Text;
}
if (translatedText == null || translatedText.Length == 0)
{
translatedText = TextManager.GetServerMessage(Text);
}
return translatedText;
}
}
@@ -72,8 +72,6 @@ namespace Barotrauma.Networking
public HashSet<string> GivenAchievements = new HashSet<string>();
public HashSet<string> GivenAchievements = new HashSet<string>();
public ClientPermissions Permissions = ClientPermissions.None;
public List<DebugConsole.Command> PermittedConsoleCommands
{
@@ -15,7 +15,7 @@ namespace Barotrauma.Networking
public LogMessage(string text, MessageType type)
{
Text = "[" + DateTime.Now.ToString() + "] " + text;
Text = "[" + DateTime.Now.ToString() + "] " + TextManager.GetServerMessage(text);
Type = type;
}
}