Merge pull request #193 from DiplomacyTeam/dev

v1.2.1 release
DiplomacyTeam · Feb 4, 2023 · a3ab980 · a3ab980
2 parents 01e8008 + 7169af7
commit a3ab980
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/build/common.props b/build/common.props
@@ -2,7 +2,7 @@
 
     <!--Module Version-->
     <PropertyGroup>
-        <Version>1.2.0</Version>
+        <Version>1.2.1</Version>
         <GameVersion>1.0.0</GameVersion>
     </PropertyGroup>
 

diff --git a/changelog.txt b/changelog.txt
@@ -1,4 +1,8 @@
 ---------------------------------------------------------------------------------------------------
+Version: 1.2.1
+Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0
+* Fixed rare crash that happened when War Exhaustion event precedes the war.
+---------------------------------------------------------------------------------------------------
 Version: 1.2.0
 Game Versions: v1.0.0,v1.0.1,v1.0.2,v1.0.3,v1.1.0
 * Adapted for v1.1.0

diff --git a/crowdin.yml b/crowdin.yml
@@ -1,6 +1,6 @@
 files:
   - source: /src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/*.xml
-    translation: /src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/%two_letters_code%/%original_file_name%
+    translation: /src/Bannerlord.Diplomacy/_Module/ModuleData/Languages/%two_letters_code%/%two_letters_code%_%original_file_name%
     content_segmentation: 0
     translatable_elements:
       - '/base/tags/tag[@language],/base/strings/string[@text]'

diff --git a/src/Bannerlord.Diplomacy/WarExhaustion/WarExhaustionManager.EventHandling.cs b/src/Bannerlord.Diplomacy/WarExhaustion/WarExhaustionManager.EventHandling.cs
@@ -376,7 +376,7 @@ private WarExhaustionRecord GetDivineWarExhaustionDelta(Kingdoms kingdoms, int t
         }
 
         private float GetDiminishingReturnsFactor<TObj, TRec>(Kingdoms kingdoms, TObj eventRelatedObject, out bool yieldsDiminishingReturns) where TObj : MBObjectBase where TRec : WarExhaustionEventRecord =>
-            GetDiminishingReturnsFactor<TObj, TRec>(eventRelatedObject, _warExhaustionEventRecords[kingdoms.Key!], out yieldsDiminishingReturns);
+            GetDiminishingReturnsFactor<TObj, TRec>(eventRelatedObject, _warExhaustionEventRecords.TryGetValue(kingdoms.Key!, out var currentRecords) ? currentRecords : new(), out yieldsDiminishingReturns);
 
         private static float GetDiminishingReturnsFactor<TObj, TRec>(TObj eventRelatedObject, List<WarExhaustionEventRecord> warExhaustionEventRecords, out bool yieldsDiminishingReturns) where TObj : MBObjectBase where TRec : WarExhaustionEventRecord
         {