mirror of
https://github.com/araxiaonline/TrinityCore.git
synced 2026-06-17 21:50:50 -04:00
Core/Spells: Fixed cast time mods using two charges on every cast
This commit is contained in:
@@ -2968,11 +2968,11 @@ void Unit::SetCurrentCastedSpell(Spell* pSpell)
|
||||
if (m_currentSpells[CURRENT_AUTOREPEAT_SPELL])
|
||||
{
|
||||
// break autorepeat if not Auto Shot
|
||||
if (m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id != 75)
|
||||
if (m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->GetSpellInfo()->Id != 75)
|
||||
InterruptSpell(CURRENT_AUTOREPEAT_SPELL);
|
||||
m_AutoRepeatFirstCast = true;
|
||||
}
|
||||
if (pSpell->m_spellInfo->CalcCastTime(this) > 0)
|
||||
if (pSpell->GetCastTime() > 0)
|
||||
AddUnitState(UNIT_STATE_CASTING);
|
||||
|
||||
break;
|
||||
@@ -2985,7 +2985,7 @@ void Unit::SetCurrentCastedSpell(Spell* pSpell)
|
||||
|
||||
// it also does break autorepeat if not Auto Shot
|
||||
if (m_currentSpells[CURRENT_AUTOREPEAT_SPELL] &&
|
||||
m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->m_spellInfo->Id != 75)
|
||||
m_currentSpells[CURRENT_AUTOREPEAT_SPELL]->GetSpellInfo()->Id != 75)
|
||||
InterruptSpell(CURRENT_AUTOREPEAT_SPELL);
|
||||
AddUnitState(UNIT_STATE_CASTING);
|
||||
|
||||
@@ -2994,7 +2994,7 @@ void Unit::SetCurrentCastedSpell(Spell* pSpell)
|
||||
case CURRENT_AUTOREPEAT_SPELL:
|
||||
{
|
||||
// only Auto Shoot does not break anything
|
||||
if (pSpell->m_spellInfo->Id != 75)
|
||||
if (pSpell->GetSpellInfo()->Id != 75)
|
||||
{
|
||||
// generic autorepeats break generic non-delayed and channeled non-delayed spells
|
||||
InterruptSpell(CURRENT_GENERIC_SPELL, false);
|
||||
|
||||
Reference in New Issue
Block a user