Handle an I:R unit having no leader (#2819) #patch

Sentry event ID: accd5806778747d1b87d0faa442d3af6

Author: IhateTrains

ImperatorToCK3/CK3/Characters/Character.cs

@@ -778,7 +778,8 @@ CK3LocDB ck3LocDB
 	}
 	internal void ImportUnitsAsSpecialTroops(
 		IEnumerable<Unit> countryUnits,
-		Imperator.Characters.CharacterCollection imperatorCharacters,
+		Imperator.Characters.CharacterCollection irCharacters,
+		CountryCollection irCountries,
 		Date date,
 		UnitTypeMapper unitTypeMapper,
 		ProvinceMapper provinceMapper,
@@ -790,8 +791,17 @@ CK3LocDB ck3LocDB
 		foreach (var unit in countryUnits) {
 			var menPerUnitType = unitTypeMapper.GetMenPerCK3UnitType(unit.MenPerUnitType);
 
-			var imperatorLeader = imperatorCharacters[unit.LeaderId];
-			var ck3Leader = imperatorLeader.CK3Character;
+			if (unit.LeaderId is null || !irCharacters.TryGetValue(unit.LeaderId.Value, out var irLeader)) {
+				// Use country ruler.
+				irLeader = irCountries[unit.CountryId].Monarch;
+			}
+
+			if (irLeader is null) {
+				Logger.Warn($"Unit {unit.Id} has no leader and country {unit.CountryId} has no ruler! Skipping special troop spawn.");
+				continue;
+			}
+
+			var ck3Leader = irLeader.CK3Character;
 
 			sb.AppendLine("\t\tspawn_army={");
 

ImperatorToCK3/CK3/Characters/CharacterCollection.cs

@@ -9,6 +9,7 @@
 using ImperatorToCK3.CommonUtils.Map;
 using ImperatorToCK3.Imperator.Armies;
 using ImperatorToCK3.Imperator.Characters;
+using ImperatorToCK3.Imperator.Countries;
 using ImperatorToCK3.Mappers.Culture;
 using ImperatorToCK3.Mappers.DeathReason;
 using ImperatorToCK3.Mappers.Nickname;
@@ -632,6 +633,7 @@ internal void ImportLegions(
 		Title.LandedTitles titles,
 		UnitCollection imperatorUnits,
 		Imperator.Characters.CharacterCollection imperatorCharacters,
+		CountryCollection irCountries,
 		Date date,
 		UnitTypeMapper unitTypeMapper,
 		IdObjectCollection<string, MenAtArmsType> menAtArmsTypes,
@@ -660,7 +662,7 @@ Configuration config
 			if (config.LegionConversion == LegionConversion.MenAtArms) {
 				ruler.ImportUnitsAsMenAtArms(countryLegions, date, unitTypeMapper, menAtArmsTypes, ck3LocDB);
 			} else if (config.LegionConversion == LegionConversion.SpecialTroops) {
-				ruler.ImportUnitsAsSpecialTroops(countryLegions, imperatorCharacters, date, unitTypeMapper, provinceMapper, ck3LocDB);
+				ruler.ImportUnitsAsSpecialTroops(countryLegions, imperatorCharacters, irCountries, date, unitTypeMapper, provinceMapper, ck3LocDB);
 			}
 		}
 

ImperatorToCK3/CK3/World.cs

@@ -361,7 +361,7 @@ public World(Imperator.World impWorld, Configuration config, Thread? irCoaExtrac
 
 		// Gold needs to be distributed after characters' successors are generated.
 		Characters.DistributeCountriesGold(LandedTitles, config);
-		Characters.ImportLegions(LandedTitles, impWorld.Units, impWorld.Characters, CorrectedDate, unitTypeMapper, MenAtArmsTypes, provinceMapper, LocDB, config);
+		Characters.ImportLegions(LandedTitles, impWorld.Units, impWorld.Characters, impWorld.Countries, CorrectedDate, unitTypeMapper, MenAtArmsTypes, provinceMapper, LocDB, config);
 
 		// After the purging of unneeded characters, we should clean up the title history.
 		LandedTitles.CleanUpHistory(Characters, config.CK3BookmarkDate);

ImperatorToCK3/Imperator/Armies/Unit.cs

@@ -13,9 +13,9 @@ internal sealed class Unit : IIdentifiable<ulong> {
 	public bool IsArmy { get; private set; } = true;
 	public bool IsLegion { get; private set; } = false;
 	public ulong CountryId { get; set; }
-	public ulong LeaderId { get; set; } // character id
+	public ulong? LeaderId { get; set; } // character id
 	public ulong Location { get; set; } // province id
-	private List<ulong> CohortIds { get; } = new();
+	private List<ulong> CohortIds { get; } = [];
 
 	public LocBlock? LocalizedName { get; private set; }
 	public FrozenDictionary<string, int> MenPerUnitType { get; }