Unstable 1.1.14.0
This commit is contained in:
+7
-3
@@ -260,7 +260,7 @@ namespace Barotrauma
|
||||
{
|
||||
//character still alive (or killed by Disconnect) -> save it as-is
|
||||
characterData.RemoveAll(cd => cd.IsDuplicate(data));
|
||||
data.Refresh(character);
|
||||
data.Refresh(character, refreshHealthData: character.CauseOfDeath?.Type != CauseOfDeathType.Disconnected);
|
||||
characterData.Add(data);
|
||||
}
|
||||
else
|
||||
@@ -318,7 +318,7 @@ namespace Barotrauma
|
||||
discardedCharacters.Clear();
|
||||
}
|
||||
|
||||
protected override IEnumerable<CoroutineStatus> DoLevelTransition(TransitionType transitionType, LevelData newLevel, Submarine leavingSub, bool mirror, List<TraitorMissionResult> traitorResults)
|
||||
protected override IEnumerable<CoroutineStatus> DoLevelTransition(TransitionType transitionType, LevelData newLevel, Submarine leavingSub, bool mirror)
|
||||
{
|
||||
IncrementAllLastUpdateIds();
|
||||
|
||||
@@ -360,7 +360,7 @@ namespace Barotrauma
|
||||
GameMain.GameSession.EventManager.RegisterEventHistory();
|
||||
}
|
||||
|
||||
GameMain.GameSession.EndRound("", traitorResults, transitionType);
|
||||
GameMain.GameSession.EndRound("", transitionType);
|
||||
|
||||
//--------------------------------------
|
||||
|
||||
@@ -1361,6 +1361,10 @@ namespace Barotrauma
|
||||
|
||||
modeElement.Add(Settings.Save());
|
||||
modeElement.Add(SaveStats());
|
||||
if (GameMain.Server?.TraitorManager is TraitorManager traitorManager)
|
||||
{
|
||||
modeElement.Add(traitorManager.Save());
|
||||
}
|
||||
modeElement.Add(Bank.Save());
|
||||
|
||||
if (GameMain.GameSession?.EventManager != null)
|
||||
|
||||
Reference in New Issue
Block a user