Fix for governor-held titles preserving vanilla holders (#332) #patch

* Update commonItems.NET

* Fix for governor-held titles preserving vanilla holders

* Update Fronter

Author: IhateTrains

Fronter

@@ -92,9 +92,9 @@ DefiniteFormMapper definiteFormMapper
 
 			PlayerCountry = ImperatorCountry.PlayerCountry;
 
+			ClearHolderSpecificHistory();
+
 			// ------------------ determine previous and current holders
-			history.InternalHistory.SimpleFields.Remove("holder");
-			history.InternalHistory.SimpleFields.Remove("government");
 			// there was no 0 AD, but year 0 works in game and serves well for adding BC characters to holder history
 			var firstPossibleDate = new Date(0, 1, 1);
 
@@ -239,11 +239,14 @@ ImperatorRegionMapper imperatorRegionMapper
 
 			var impGovernor = imperatorCharacters[governorship.CharacterID];
 			var normalizedStartDate = governorship.StartDate.Year > 0 ? governorship.StartDate : new Date(1, 1, 1);
+
+			ClearHolderSpecificHistory();
+
 			// ------------------ determine holder
 			history.InternalHistory.AddSimpleFieldValue("holder", $"imperator{impGovernor.ID}", normalizedStartDate);
 
 			// ------------------ determine government
-			var ck3LiegeGov = country.CK3Title.GetGovernment(governorship.StartDate);
+			var ck3LiegeGov = country.CK3Title.GetGovernment(normalizedStartDate);
 			if (ck3LiegeGov is not null) {
 				history.InternalHistory.AddSimpleFieldValue("government", ck3LiegeGov, normalizedStartDate);
 			}

ImperatorToCK3/CK3/Titles/Title.cs

@@ -440,7 +440,7 @@ private void OverWriteCountiesHistory(List<Governorship> governorships, Date ck3
 							Logger.Warn(nameof(ck3GovernorshipName) + $" is null for {ck3Country.Name} {governorship.RegionName}!");
 							continue;
 						}
-						GiveCountryToGovernor(ck3BookmarkDate, title, ck3GovernorshipName);
+						GiveCountyToGovernor(ck3BookmarkDate, title, ck3GovernorshipName);
 					} else if (impMonarch is not null) {
 						GiveCountyToMonarch(title, ck3Country, (ulong)impMonarch);
 					}
@@ -458,12 +458,13 @@ void GiveCountyToMonarch(Title title, Title ck3Country, ulong impMonarch) {
 				title.DeFactoLiege = null;
 			}
 
-			void GiveCountryToGovernor(Date ck3BookmarkDate, Title title, string ck3GovernorshipName) {
+			void GiveCountyToGovernor(Date ck3BookmarkDate, Title title, string ck3GovernorshipName) {
 				var ck3Governorship = LandedTitles[ck3GovernorshipName];
 				var holderId = ck3Governorship.GetHolderId(ck3BookmarkDate);
 				if (Characters.TryGetValue(holderId, out var governor)) {
 					title.ClearHolderSpecificHistory();
-					title.SetHolderId(governor.ID, ck3Governorship.GetDateOfLastHolderChange());
+					var date = ck3Governorship.GetDateOfLastHolderChange();
+					title.SetHolderId(governor.ID, date);
 				} else {
 					Logger.Warn($"Holder {holderId} of county {title.Name} doesn't exist!");
 				}

ImperatorToCK3/CK3/World.cs

@@ -26,21 +26,21 @@ public History(Dictionary<string, SimpleField> simpleFields, Dictionary<string,
 		}
 
 		public void AddSimpleFieldValue(string fieldName, string value, Date date) {
-			if (SimpleFields.ContainsKey(fieldName)) {
-				SimpleFields[fieldName].AddValueToHistory(value, date);
-			} else {
-				var field = new SimpleField(null);
+			if (SimpleFields.TryGetValue(fieldName, out var field)) {
 				field.AddValueToHistory(value, date);
-				SimpleFields.Add(fieldName, field);
+			} else {
+				var newField = new SimpleField(null);
+				newField.AddValueToHistory(value, date);
+				SimpleFields.Add(fieldName, newField);
 			}
 		}
 		public void AddContainerFieldValue(string fieldName, List<string> value, Date date) {
-			if (ContainerFields.ContainsKey(fieldName)) {
-				ContainerFields[fieldName].AddValueToHistory(value, date);
-			} else {
-				var field = new ContainerField(new());
+			if (ContainerFields.TryGetValue(fieldName, out var field)) {
 				field.AddValueToHistory(value, date);
-				ContainerFields.Add(fieldName, field);
+			} else {
+				var newField = new ContainerField(new());
+				newField.AddValueToHistory(value, date);
+				ContainerFields.Add(fieldName, newField);
 			}
 		}
 	}