From ac8086eda28e9f3a469244f0d227ad51b3ccb428 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Thu, 14 Sep 2023 04:37:12 -0400 Subject: [PATCH] Core/AreaTrigger: Handle unit exit after OnRemove hook has been called Port From (https://github.com/TrinityCore/TrinityCore/commit/b10b97b35bed07742b3989fa99fe932d77bd7fd2) --- Source/Game/Entities/AreaTrigger/AreaTrigger.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Game/Entities/AreaTrigger/AreaTrigger.cs b/Source/Game/Entities/AreaTrigger/AreaTrigger.cs index 888c89841..03cf410d1 100644 --- a/Source/Game/Entities/AreaTrigger/AreaTrigger.cs +++ b/Source/Game/Entities/AreaTrigger/AreaTrigger.cs @@ -63,11 +63,11 @@ namespace Game.Entities if (caster) caster._UnregisterAreaTrigger(this); + _ai.OnRemove(); + // Handle removal of all units, calling OnUnitExit & deleting auras if needed HandleUnitEnterExit(new List()); - _ai.OnRemove(); - base.RemoveFromWorld(); if (_spawnId != 0) GetMap().GetAreaTriggerBySpawnIdStore().Remove(_spawnId, this);