Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git

2022-07-14 12:25:44 -03:00
parent 5540330295 f6b226ea7e
commit c5860d13d5
86 changed files with 839 additions and 412 deletions
@@ -1750,9 +1750,9 @@ namespace Barotrauma
                                addIfMissing($"missionfailure.{missionId}".ToIdentifier(), language);
                            }
                        }
-                        for (int i = 0; i<missionPrefab.Messages.Length; i++)
+                        for (int i = 0; i < missionPrefab.Messages.Length; i++)
                        {
-                            if (missionPrefab.Messages[i].IsNullOrWhiteSpace())
+                            if (missionPrefab.Messages[i].IsNullOrWhiteSpace() || (missionPrefab.Messages[i] as FallbackLString)?.GetLastFallback() is FallbackLString { PrimaryIsLoaded: false })
                            {
                                addIfMissing($"MissionMessage{i}.{missionId}".ToIdentifier(), language);
                            }