Merge pull request #13968 from Gooyeth/6.x.stuck

Core/Spells: Stuck effect correction (6.0.3)
This commit is contained in:
Duarte Duarte
2015-01-27 21:03:04 +00:00

View File

@@ -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