From 3edd93d1e54081d1b3c01916cc2082dc6f4157b7 Mon Sep 17 00:00:00 2001 From: Gooyeth Date: Tue, 27 Jan 2015 14:08:13 -0600 Subject: Core/Spells: Correction Stuck effect (6.0.3) 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 | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 3eeb50a2d39..64e74424f70 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -3942,7 +3942,13 @@ void Spell::EffectStuck(SpellEffIndex /*effIndex*/) return; } - // the player is teleported to home + // 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 -- cgit v1.2.3