From b10b97b35bed07742b3989fa99fe932d77bd7fd2 Mon Sep 17 00:00:00 2001
From: ModoX <moardox@gmail.com>
Date: Thu, 24 Aug 2023 09:09:45 +0200
Subject: Core/AreaTrigger: Handle unit exit after OnRemove hook has been
 called

---
 src/server/game/Entities/AreaTrigger/AreaTrigger.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp b/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp
index cea910b24c4..efaae072f82 100644
--- a/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp
+++ b/src/server/game/Entities/AreaTrigger/AreaTrigger.cpp
@@ -88,11 +88,11 @@ void AreaTrigger::RemoveFromWorld()
         if (Unit* caster = GetCaster())
             caster->_UnregisterAreaTrigger(this);
 
+        _ai->OnRemove();
+
         // Handle removal of all units, calling OnUnitExit & deleting auras if needed
         HandleUnitEnterExit({});
 
-        _ai->OnRemove();
-
         WorldObject::RemoveFromWorld();
 
         if (_spawnId)
-- 
cgit v1.2.3