mirror of
https://github.com/araxiaonline/TrinityCore.git
synced 2026-06-21 23:38:54 -04:00
*Merge.
--HG-- branch : trunk
This commit is contained in:
@@ -203,13 +203,21 @@ void ScriptedAI::DoStopAttack()
|
||||
|
||||
void ScriptedAI::DoCast(Unit* victim, uint32 spellId, bool triggered)
|
||||
{
|
||||
if (!victim || m_creature->hasUnitState(UNIT_STAT_CASTING))
|
||||
if (!victim || m_creature->hasUnitState(UNIT_STAT_CASTING) && !triggered)
|
||||
return;
|
||||
|
||||
//m_creature->StopMoving();
|
||||
m_creature->CastSpell(victim, spellId, triggered);
|
||||
}
|
||||
|
||||
void ScriptedAI::DoCastAOE(uint32 spellId, bool triggered)
|
||||
{
|
||||
if(!triggered && m_creature->hasUnitState(UNIT_STAT_CASTING))
|
||||
return;
|
||||
|
||||
m_creature->CastSpell((Unit*)NULL, spellId, triggered);
|
||||
}
|
||||
|
||||
void ScriptedAI::DoCastSpell(Unit* who,SpellEntry const *spellInfo, bool triggered)
|
||||
{
|
||||
if (!who || m_creature->IsNonMeleeSpellCasted(false))
|
||||
|
||||
Reference in New Issue
Block a user