(f0d812055) v0.9.9.0

This commit is contained in:
Joonas Rikkonen
2020-04-23 19:19:37 +03:00
parent b647059b93
commit ac37a3b0e4
391 changed files with 15054 additions and 5420 deletions
@@ -235,7 +235,7 @@ namespace Barotrauma
#if SERVER
foreach (var traitor in Traitors.Values)
{
GameServer.Log($"{traitor.Character.Name} is a traitor and the current goals are:\n{(traitor.CurrentObjective?.GoalInfos != null ? TextManager.GetServerMessage(traitor.CurrentObjective?.GoalInfos) : "(empty)")}", ServerLog.MessageType.ServerMessage);
GameServer.Log($"{GameServer.CharacterLogName(traitor.Character)} is a traitor and the current goals are:\n{(traitor.CurrentObjective?.GoalInfos != null ? TextManager.GetServerMessage(traitor.CurrentObjective?.GoalInfos) : "(empty)")}", ServerLog.MessageType.ServerMessage);
}
#endif
return true;
@@ -287,10 +287,7 @@ namespace Barotrauma
{
pendingObjectives.Remove(objective);
completedObjectives.Add(objective);
if (pendingObjectives.Count > 0)
{
objective.EndMessage();
}
objective.EndMessage();
continue;
}
if (objective.IsStarted && !objective.CanBeCompleted)