From b68768e9841585063aa4434a11a1f6199c47efdc Mon Sep 17 00:00:00 2001 From: Gooyeth Date: Tue, 27 Jan 2015 14:01:45 -0600 Subject: [PATCH] Core/Spells: Correction Stuck effect (4.3.4) The player dies if heathstone is in cooldown, else the player is teleported to home. Thanks @F03SD and @Kinzcool. --- src/server/game/Spells/SpellEffects.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 72311cc64a9..90bdfe496dd 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -3940,8 +3940,14 @@ void Spell::EffectStuck(SpellEffIndex /*effIndex*/) return; } - // the player dies - player->Kill(player); + // the player dies if hearthstone is in cooldown, else the player is teleported to home + if (player->HasSpellCooldown(8690)) + { + player->Kill(player); + return; + } + + player->TeleportTo(player->m_homebindMapId, player->m_homebindX, player->m_homebindY, player->m_homebindZ, player->GetOrientation(), TELE_TO_SPELL); // Stuck spell trigger Hearthstone cooldown SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(8690);