From 750be73b9963ebcd4b823ec88b20af7cd819529b Mon Sep 17 00:00:00 2001
From: Killyana <morphone1@gmail.com>
Date: Sat, 9 Mar 2019 21:11:21 +0100
Subject: SAI/GameObject: Despawn the linked trap with the gameobject

Closes #23105
---
 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 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();
 
-- 
cgit v1.2.3