From dacf5c393438ae561bf5defece25fb5647ca282e Mon Sep 17 00:00:00 2001 From: IhateTrains Date: Sun, 10 Mar 2024 16:46:34 +0100 Subject: [PATCH] Don't load cultures without a valid language (#1824) #patch Sentry event ID: 6a18841dcfef4bedb55ac534d6c96b65 --- .../CK3/Cultures/CultureCollectionTests.cs | 5 ++++- .../CK3/game/common/culture/cultures/test_cultures.txt | 2 ++ ImperatorToCK3/CK3/Cultures/CultureCollection.cs | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ImperatorToCK3.UnitTests/CK3/Cultures/CultureCollectionTests.cs b/ImperatorToCK3.UnitTests/CK3/Cultures/CultureCollectionTests.cs index 0d4e06ea2..95c4bc8a9 100644 --- a/ImperatorToCK3.UnitTests/CK3/Cultures/CultureCollectionTests.cs +++ b/ImperatorToCK3.UnitTests/CK3/Cultures/CultureCollectionTests.cs @@ -17,7 +17,10 @@ public class CultureCollectionTests { private static readonly List ck3ModFlags = []; static CultureCollectionTests() { - pillars = new PillarCollection(colorFactory, []) { new("test_heritage", new PillarData { Type = "heritage" }) }; + pillars = new PillarCollection(colorFactory, []) { + new("test_heritage", new PillarData { Type = "heritage" }), + new("test_language", new PillarData { Type = "language" }) + }; } [Fact] diff --git a/ImperatorToCK3.UnitTests/TestFiles/CK3/game/common/culture/cultures/test_cultures.txt b/ImperatorToCK3.UnitTests/TestFiles/CK3/game/common/culture/cultures/test_cultures.txt index be576b2d5..572e6b453 100644 --- a/ImperatorToCK3.UnitTests/TestFiles/CK3/game/common/culture/cultures/test_cultures.txt +++ b/ImperatorToCK3.UnitTests/TestFiles/CK3/game/common/culture/cultures/test_cultures.txt @@ -2,10 +2,12 @@ culture_with_color = { color = rgb { 10 20 30 } heritage = test_heritage + language = test_language name_list = test_name_list } culture_without_color = { heritage = test_heritage + language = test_language name_list = test_name_list } \ No newline at end of file diff --git a/ImperatorToCK3/CK3/Cultures/CultureCollection.cs b/ImperatorToCK3/CK3/Cultures/CultureCollection.cs index 8d6824774..32cc09955 100644 --- a/ImperatorToCK3/CK3/Cultures/CultureCollection.cs +++ b/ImperatorToCK3/CK3/Cultures/CultureCollection.cs @@ -117,6 +117,10 @@ private void LoadCulture(string cultureId, BufferedReader cultureReader) { Logger.Warn($"Culture {cultureId} has no heritage defined! Skipping."); return; } + if (cultureData.Language is null) { + Logger.Warn($"Culture {cultureId} has no language defined! Skipping."); + return; + } if (cultureData.NameLists.Count == 0) { Logger.Warn($"Culture {cultureId} has no name list defined! Skipping."); return;