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

*Cleanup InterruptNonMeleeSpells. Backported from TC2. Source: Mangos.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-04-29 18:10:00 -05:00
parent 59e79dfef0
commit 98cda77146
1 changed files with 6 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/game/Unit.cpp
View File

@@ -3485,40 +3485,16 @@ bool Unit::IsNonMeleeSpellCasted(bool withDelayed, bool skipChanneled, bool skip
void Unit::InterruptNonMeleeSpells(bool withDelayed, uint32 spell_id)
{
// generic spells are interrupted if they are not finished or delayed
Spell *spell = m_currentSpells[CURRENT_GENERIC_SPELL];
if (spell && (!spell_id || spell->m_spellInfo->Id==spell_id))
{
m_currentSpells[CURRENT_GENERIC_SPELL] = NULL;
if (m_currentSpells[CURRENT_GENERIC_SPELL] && (!spell_id || m_currentSpells[CURRENT_GENERIC_SPELL]->m_spellInfo->Id==spell_id))
InterruptSpell(CURRENT_GENERIC_SPELL,withDelayed);
if ( (spell->getState() != SPELL_STATE_FINISHED) &&
(withDelayed || spell->getState() != SPELL_STATE_DELAYED) )
spell->cancel();
spell->SetReferencedFromCurrent(false);
}
spell = m_currentSpells[CURRENT_AUTOREPEAT_SPELL];
// autorepeat spells are interrupted if they are not finished or delayed
if (spell && (!spell_id || spell->m_spellInfo->Id==spell_id))
{
m_currentSpells[CURRENT_AUTOREPEAT_SPELL] = NULL;
// send disable autorepeat packet in any case
if(GetTypeId()==TYPEID_PLAYER)
((Player*)this)->SendAutoRepeatCancel();
if ( (spell->getState() != SPELL_STATE_FINISHED) &&
(withDelayed || spell->getState() != SPELL_STATE_DELAYED) )
spell->cancel();
spell->SetReferencedFromCurrent(false);
}
if (m_currentSpells[CURRENT_AUTOREPEAT_SPELL] && (!spell_id || m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id==spell_id))
InterruptSpell(CURRENT_AUTOREPEAT_SPELL,withDelayed);
// channeled spells are interrupted if they are not finished, even if they are delayed
spell = m_currentSpells[CURRENT_CHANNELED_SPELL];
if (spell && (!spell_id || spell->m_spellInfo->Id==spell_id))
{
m_currentSpells[CURRENT_CHANNELED_SPELL] = NULL;
if (spell->getState() != SPELL_STATE_FINISHED)
spell->cancel();
spell->SetReferencedFromCurrent(false);
}
if (m_currentSpells[CURRENT_CHANNELED_SPELL] && (!spell_id || m_currentSpells[CURRENT_CHANNELED_SPELL]->m_spellInfo->Id==spell_id))
InterruptSpell(CURRENT_CHANNELED_SPELL,true);
}
Spell* Unit::FindCurrentSpellBySpellId(uint32 spell_id) const