Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 18:36:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/AreaTrigger: Make sure areatrigger is removed correctly

Browse Source
This commit is contained in:
joschiwald
2017-06-03 19:31:00 +02:00
parent df20ad1e37
commit 5fea484092
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/server/game/Entities/AreaTrigger/AreaTrigger.cpp
View File

@@ -69,6 +69,16 @@ void AreaTrigger::RemoveFromWorld()
///- Remove the AreaTrigger from the accessor and from all lists of objects in world
if (IsInWorld())
{
_isRemoved = true;
if (Unit* caster = GetCaster())
caster->_UnregisterAreaTrigger(this);
// Handle removal of all units, calling OnUnitExit & deleting auras if needed
HandleUnitEnterExit({});
_ai->OnRemove();
WorldObject::RemoveFromWorld();
GetMap()->GetObjectsStore().Remove<AreaTrigger>(GetGUID());
}
@@ -194,16 +204,6 @@ void AreaTrigger::Remove()
{
if (IsInWorld())
{
_isRemoved = true;
if (Unit* caster = GetCaster())
caster->_UnregisterAreaTrigger(this);
// Handle removal of all units, calling OnUnitExit & deleting auras if needed
HandleUnitEnterExit({});
_ai->OnRemove();
AddObjectToRemoveList(); // calls RemoveFromWorld
}
}