From 2aa05b951b3a01f5fc7e311fda53f14fdd5ac09d Mon Sep 17 00:00:00 2001
From: Eridium <6587064+Killyana@users.noreply.github.com>
Date: Sun, 26 Apr 2020 21:25:54 +0200
Subject: [PATCH] =?UTF-8?q?Core/GameObject:=20Remove=20linked=20traps=20wh?=
 =?UTF-8?q?en=20the=20main=20GameObject=20is=20remo=E2=80=A6=20(#24480)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Core/GameObject: Remove linked traps when the main GameObject is removed from from the world

* Indentation
---
 src/server/game/Entities/GameObject/GameObject.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index fee9b53124c..a9f0ba025cf 100644
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -248,6 +248,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)
@@ -848,10 +852,6 @@ void GameObject::DespawnOrUnsummon(Milliseconds const& delay, Seconds const& for
 
 void GameObject::Delete()
 {
-    // If nearby linked trap exists, despawn it
-    if (GameObject* linkedTrap = GetLinkedTrap())
-        linkedTrap->DespawnOrUnsummon();
-
     SetLootState(GO_NOT_READY);
     RemoveFromOwner();