- Job assignment fix: characters that are in a different team don't add to the assigned job count.

- If a client doesn't enter the game within 30 seconds of starting the game, their character is automatically killed (otherwise the character would stay in-game in the disabled state indefinitely).
- Clients don't update CombatMissions if neither team has any characters (the clients may not have received messages about the characters spawning yet, which would cause them to show the "team dead" message immediately when the round starts).
This commit is contained in:
Regalis
2017-06-02 21:54:20 +03:00
parent 0e5cfbb579
commit 6aae2f0ae9
2 changed files with 24 additions and 3 deletions
@@ -166,7 +166,13 @@ namespace Barotrauma
}
}
}
if (GameMain.Client == null)
{
//no characters in either team, i.e. the client hasn't received spawn messages yet
if (crews[0].Count == 0 && crews[1].Count == 0) return;
}
bool[] teamDead =
{
crews[0].All(c => c.IsDead || c.IsUnconscious),