aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKillyana <morphone1@gmail.com>2019-03-09 21:11:21 +0100
committerKillyana <morphone1@gmail.com>2019-03-09 21:11:21 +0100
commit750be73b9963ebcd4b823ec88b20af7cd819529b (patch)
tree293199acfcc62ceeab203df8eab8faa533e85181 /src
parentdff66b9daa14a17613b216e8bf699793740f7228 (diff)
SAI/GameObject: Despawn the linked trap with the gameobject
Closes #23105
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/GameObject/GameObject.cpp4
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 209f1d67c61..5ffed183fd5 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -879,6 +879,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();