Fix crash when player in settlement and enter then exit ebt

lzh-mb-mod · Aug 31, 2022 · eb5369a · eb5369a
1 parent 0a87b56
commit eb5369a
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/.github/resources/config.env b/.github/resources/config.env
@@ -1,3 +1,3 @@
 GAME_VERSION=e1.8.0
 GAME_BRANCH=beta
-MOD_VERSION=v3.0.0
+MOD_VERSION=v3.0.1
diff --git a/source/EnhancedBattleTest/Modules/EnhancedBattleTest/SubModule.xml b/source/EnhancedBattleTest/Modules/EnhancedBattleTest/SubModule.xml
@@ -2,7 +2,7 @@
 <Module>
   <Name value="EnhancedBattleTest"/>
   <Id value="EnhancedBattleTest"/>
-  <Version value="v3.0.0"/>
+  <Version value="v3.0.1"/>
   <SingleplayerModule value="true"/>
   <MultiplayerModule value="false"/>
   <DependedModules>

diff --git a/source/EnhancedBattleTest/src/EnhancedBattleTestSubModule.cs b/source/EnhancedBattleTest/src/EnhancedBattleTestSubModule.cs
@@ -1,20 +1,16 @@
-using System;
-using System.IO;
-using System.Reflection;
 using EnhancedBattleTest.Data;
-using EnhancedBattleTest.GameMode;
 using EnhancedBattleTest.Patch;
 using EnhancedBattleTest.Patch.Fix;
 using EnhancedBattleTest.SinglePlayer;
 using EnhancedBattleTest.UI;
 using HarmonyLib;
+using System;
+using System.IO;
+using System.Reflection;
 using TaleWorlds.Core;
 using TaleWorlds.Library;
-using TaleWorlds.Localization;
-using TaleWorlds.ModuleManager;
 using TaleWorlds.MountAndBlade;
 using Campaign = TaleWorlds.CampaignSystem.Campaign;
-using Module = TaleWorlds.MountAndBlade.Module;
 using MultiplayerGame = EnhancedBattleTest.GameMode.MultiplayerGame;
 
 namespace EnhancedBattleTest

diff --git a/source/EnhancedBattleTest/src/Patch/Patch_MapScreen.cs b/source/EnhancedBattleTest/src/Patch/Patch_MapScreen.cs
@@ -4,6 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Reflection;
+using TaleWorlds.CampaignSystem;
+using TaleWorlds.CampaignSystem.Encounters;
+using TaleWorlds.CampaignSystem.Party;
 using TaleWorlds.Core;
 using TaleWorlds.Localization;
 using TaleWorlds.MountAndBlade.ViewModelCollection.EscapeMenu;
@@ -37,6 +40,13 @@ public static void Postfix_GetEscapeMenuItems(MapScreen __instance, List<EscapeM
                 o =>
                 {
                     __instance.CloseEscapeMenu();
+                    if (PlayerEncounter.Current != null)
+                    {
+                        PlayerEncounter.Finish();
+                        typeof(MapScreen).GetMethod("ExitMenuContext", BindingFlags.Instance | BindingFlags.NonPublic)
+                            .Invoke(__instance, new object[] { });
+                    }
+
                     Game.Current.GameStateManager.PushState(Game.Current.GameStateManager.CreateState<EnhancedBattleTestState>());
                 }, null, () => new Tuple<bool, TextObject>(false, TextObject.Empty)));
         }