From ffae92edd23a37d63aeed01544018944716b4a83 Mon Sep 17 00:00:00 2001 From: Killyana Date: Sun, 11 Mar 2018 18:07:44 +0100 Subject: Core/GameObject: Fix linked traps not being despawned properly and remove deprecated code Closes #20159 (cherry picked from commit 8f0af67bcb56712d4c333f36a1c2030443c10fb7) --- src/server/game/Entities/GameObject/GameObject.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src') diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index 6a13100d63d..a18fe4277d8 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -657,10 +657,6 @@ void GameObject::Update(uint32 diff) m_SkillupList.clear(); m_usetimes = 0; - // If nearby linked trap exists, respawn it - if (GameObject* linkedTrap = GetLinkedTrap()) - linkedTrap->SetLootState(GO_READY); - switch (GetGoType()) { case GAMEOBJECT_TYPE_FISHINGNODE: // can't fish now @@ -857,7 +853,7 @@ void GameObject::Update(uint32 diff) { // If nearby linked trap exists, despawn it if (GameObject* linkedTrap = GetLinkedTrap()) - linkedTrap->SetLootState(GO_JUST_DEACTIVATED); + linkedTrap->DespawnOrUnsummon(); //if Gameobject should cast spell, then this, but some GOs (type = 10) should be destroyed if (GetGoType() == GAMEOBJECT_TYPE_GOOBER) -- cgit v1.2.3