diff options
author | Killyana <morphone1@gmail.com> | 2019-03-09 21:11:21 +0100 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2021-11-24 21:22:50 +0100 |
commit | 8d806f8c6943b54533dbf9a69febee3df1d00430 (patch) | |
tree | 29360a2d43f839ca05429e86d930338bff97e311 | |
parent | 268e0bea184ef8dc8d56c9f4baccb876ed245db4 (diff) |
SAI/GameObject: Despawn the linked trap with the gameobject
Closes #23105
(cherry picked from commit 750be73b9963ebcd4b823ec88b20af7cd819529b)
-rw-r--r-- | src/server/game/Entities/GameObject/GameObject.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index b3518b8f5e4..63a77e39ebc 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -1006,6 +1006,10 @@ 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(); |