Add conditional access to ResolveVariable usages after commonItems AP…

…I change (#1645) #patch
ParadoxGameConverters · Dec 16, 2023 · 1b81c32 · 1b81c32
1 parent 8d8e396
commit 1b81c32
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ImperatorToCK3/Mappers/Culture/CultureMappingRule.cs b/ImperatorToCK3/Mappers/Culture/CultureMappingRule.cs
@@ -100,7 +100,7 @@ static CultureMappingRule() {
 		parser.RegisterKeyword("ck3Province", reader => mappingToReturn.ck3Provinces.Add(reader.GetULong()));
 		parser.RegisterKeyword("irProvince", reader => mappingToReturn.irProvinces.Add(reader.GetULong()));
 		parser.RegisterRegex(CommonRegexes.Variable, (reader, variableName) => {
-			var variableValue = reader.ResolveVariable(variableName).ToString() ?? string.Empty;
+			var variableValue = reader.ResolveVariable(variableName)?.ToString() ?? string.Empty;
 			var variableReader = new BufferedReader(variableValue);
 			variableReader.CopyVariables(reader);
 			parser.ParseStream(variableReader);

diff --git a/ImperatorToCK3/Mappers/Religion/ReligionMapping.cs b/ImperatorToCK3/Mappers/Religion/ReligionMapping.cs
@@ -36,7 +36,7 @@ static ReligionMapping() {
 		parser.RegisterKeyword("historicalTag", reader => mappingToReturn.irHistoricalTags.Add(reader.GetString()));
 		parser.RegisterKeyword("heresiesInHistoricalAreas", reader => mappingToReturn.heresiesInHistoricalAreas = reader.GetBool());
 		parser.RegisterRegex(CommonRegexes.Variable, (reader, variableName) => {
-			var variableValue = reader.ResolveVariable(variableName).ToString() ?? string.Empty;
+			var variableValue = reader.ResolveVariable(variableName)?.ToString() ?? string.Empty;
 			var variableReader = new BufferedReader(variableValue);
 			variableReader.CopyVariables(reader);
 			parser.ParseStream(variableReader);