From c873fe5a22f135e03e6e34879978fbb27116a04c Mon Sep 17 00:00:00 2001
From: Alex King <89047260+Kinglykrab@users.noreply.github.com>
Date: Fri, 11 Oct 2024 23:00:09 -0400
Subject: [PATCH] [Bug Fix] Fix Mercenary Encounter Crash (#4509)

---
 zone/questmgr.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zone/questmgr.cpp b/zone/questmgr.cpp
index 7ef1bace4..85167d44c 100644
--- a/zone/questmgr.cpp
+++ b/zone/questmgr.cpp
@@ -90,8 +90,6 @@ void QuestManager::Process() {
 	while (cur != end) {
 		if (cur->Timer_.Enabled() && cur->Timer_.Check()) {
 			if (cur->mob) {
-				parse->EventMob(EVENT_TIMER, cur->mob, nullptr, [&]() { return cur->name; }, 0);
-
 				if (cur->mob->IsEncounter()) {
 					parse->EventEncounter(
 						EVENT_TIMER,
@@ -100,6 +98,8 @@ void QuestManager::Process() {
 						0,
 						nullptr
 					);
+				} else {
+					parse->EventMob(EVENT_TIMER, cur->mob, nullptr, [&]() { return cur->name; }, 0);
 				}
 
 				//we MUST reset our iterator since the quest could have removed/added any