Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-30 21:57:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13967 from Gooyeth/4.3.4_stuck

Browse Source 
Core/Spells: Stuck effect correction (4.3.4)
This commit is contained in:
Duarte Duarte
2015-01-27 21:02:49 +00:00
parent 3d49285c39 b68768e984
commit 7b67984342
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/game/Spells/SpellEffects.cpp
View File

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