diff options
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObject.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 302a67f9382..ffbc3ce98e3 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -247,6 +247,10 @@ void GameObject::RemoveFromWorld() if (GetMap()->ContainsGameObjectModel(*m_model)) GetMap()->RemoveGameObjectModel(*m_model); + // If linked trap exists, despawn it + if (GameObject* linkedTrap = GetLinkedTrap()) + linkedTrap->DespawnOrUnsummon(); + WorldObject::RemoveFromWorld(); if (m_spawnId) @@ -1030,10 +1034,6 @@ void GameObject::DespawnOrUnsummon(Milliseconds delay, Seconds forceRespawnTime) void GameObject::Delete() { - // If nearby linked trap exists, despawn it - if (GameObject* linkedTrap = GetLinkedTrap()) - linkedTrap->DespawnOrUnsummon(); - SetLootState(GO_NOT_READY); RemoveFromOwner(); |