From 0078a136a43837ee277fc12052f560def0b8b186 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 8 Sep 2021 23:40:52 -0400 Subject: [PATCH] Core/GameObject: Fix linked traps not being despawned properly and remove deprecated code Port From (https://github.com/TrinityCore/TrinityCore/commit/ffae92edd23a37d63aeed01544018944716b4a83) --- Source/Game/Entities/GameObject/GameObject.cs | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Source/Game/Entities/GameObject/GameObject.cs b/Source/Game/Entities/GameObject/GameObject.cs index 0d96d6dfe..f93a3e9f8 100644 --- a/Source/Game/Entities/GameObject/GameObject.cs +++ b/Source/Game/Entities/GameObject/GameObject.cs @@ -562,11 +562,6 @@ namespace Game.Entities m_SkillupList.Clear(); m_usetimes = 0; - // If nearby linked trap exists, respawn it - GameObject linkedTrap = GetLinkedTrap(); - if (linkedTrap) - linkedTrap.SetLootState(LootState.Ready); - switch (GetGoType()) { case GameObjectTypes.FishingNode: // can't fish now @@ -768,7 +763,7 @@ namespace Game.Entities // If nearby linked trap exists, despawn it GameObject linkedTrap = GetLinkedTrap(); if (linkedTrap) - linkedTrap.SetLootState(LootState.JustDeactivated); + linkedTrap.DespawnOrUnsummon(); //if Gameobject should cast spell, then this, but some GOs (type = 10) should be destroyed if (GetGoType() == GameObjectTypes.Goober)