From f91bb7e9fe54ac89e92fe7b3a2ca27f2c76473c6 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Mon, 29 Nov 2021 14:46:00 -0500 Subject: [PATCH] SAI/GameObject: Despawn the linked trap with the gameobject Port From (https://github.com/TrinityCore/TrinityCore/commit/8d806f8c6943b54533dbf9a69febee3df1d00430) --- Source/Game/Entities/GameObject/GameObject.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Source/Game/Entities/GameObject/GameObject.cs b/Source/Game/Entities/GameObject/GameObject.cs index c7da403df..b091e1c46 100644 --- a/Source/Game/Entities/GameObject/GameObject.cs +++ b/Source/Game/Entities/GameObject/GameObject.cs @@ -919,6 +919,11 @@ namespace Game.Entities public void Delete() { + // If nearby linked trap exists, despawn it + GameObject linkedTrap = GetLinkedTrap(); + if (linkedTrap != null) + linkedTrap.DespawnOrUnsummon(); + SetLootState(LootState.NotReady); RemoveFromOwner();