Fix crash after leaving village after waiting or clicking leave too f…

…ast two times
Bannerlord-Coop-Team · Nov 11, 2024 · a2b414d · a2b414d
1 parent 5071b66
commit a2b414d
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/source/GameInterface/Services/MobileParties/Patches/LeaveSettlementActionPatches.cs b/source/GameInterface/Services/MobileParties/Patches/LeaveSettlementActionPatches.cs
@@ -21,7 +21,8 @@ public class LeaveSettlementActionPatches
     [HarmonyPatch(nameof(LeaveSettlementAction.ApplyForParty))]
     private static bool Prefix(MobileParty mobileParty)
     {
-        if(CallOriginalPolicy.IsOriginalAllowed()) return true;
+        if (mobileParty.CurrentSettlement == null) return false;
+        if (CallOriginalPolicy.IsOriginalAllowed()) return true;
 
         if (ModInformation.IsClient) return false;
 
@@ -37,7 +38,7 @@ public static void OverrideApplyForParty(MobileParty party)
         {
             using (new AllowedThread())
             {
-                LeaveSettlementAction.ApplyForParty(party);
+                if (party.CurrentSettlement != null) LeaveSettlementAction.ApplyForParty(party);
             }
         }, blocking: true);
     }