Merge revert

DiplomacyTeam · Nov 14, 2021 · 2060264 · 2060264
1 parent 5231621
commit 2060264
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 27 deletions.
diff --git a/src/Messengers/LeaveEncounterLogic.cs b/src/Messengers/LeaveEncounterLogic.cs
diff --git a/src/Messengers/MessengerManager.cs b/src/Messengers/MessengerManager.cs
@@ -46,6 +46,7 @@ public void OnEndMission()
             _messengers.Remove(_activeMessenger!);
             _activeMessenger = null;
             _currentMission = null;
+            CampaignEvents.TickEvent.AddNonSerializedListener(this, CleanUpSettlementEncounter);
         }
 
         public void OnMissionModeChange(MissionMode oldMissionMode, bool atStart)
@@ -200,11 +201,6 @@ public void StartDialogue(Hero targetHero, Messenger messenger)
                     specialScene, sceneLevels);
             }
 
-#if e165
-            _currentMission.AddMissionBehavior(new LeaveEncounterLogic());
-#else
-            _currentMission.AddMissionBehaviour(new LeaveEncounterLogic());
-#endif
             _currentMission.AddListener(this);
         }
 
@@ -251,5 +247,15 @@ public static bool CanSendMessengerWithCost(Hero opposingLeader, DiplomacyCost d
             var canPayCost = diplomacyCost.CanPayCost();
             return canPayCost && IsTargetHeroAvailable(opposingLeader);
         }
+
+        private void CleanUpSettlementEncounter(float obj)
+        {
+            PlayerEncounter.Finish();
+#if e159 || e1510
+            CampaignEvents.RemoveListeners(this);
+#else
+            CampaignEventDispatcher.Instance.RemoveListeners(this);
+#endif
+        }
     }
 }