From 8d806f8c6943b54533dbf9a69febee3df1d00430 Mon Sep 17 00:00:00 2001 From: Killyana Date: Sat, 9 Mar 2019 21:11:21 +0100 Subject: SAI/GameObject: Despawn the linked trap with the gameobject Closes #23105 (cherry picked from commit 750be73b9963ebcd4b823ec88b20af7cd819529b) --- src/server/game/Entities/GameObject/GameObject.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') 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(); -- cgit v1.2.3