*Merge.
--HG-- branch : trunk
This commit is contained in:
commit
00f50798d3
11 files changed
+114
-30
No files matched your search
+5
-1
@@ -3018,6 +3018,10 @@ void Spell::finish(bool ok)
|
||||
if (m_caster->GetTypeId() == TYPEID_PLAYER)
|
||||
((Player*)m_caster)->RemoveSpellMods(this);
|
||||
|
||||
// Okay to remove extra attacks
|
||||
if(IsSpellHaveEffect(m_spellInfo, SPELL_EFFECT_ADD_EXTRA_ATTACKS))
|
||||
m_caster->m_extraAttacks = 0;
|
||||
|
||||
// Heal caster for all health leech from all targets
|
||||
if (m_healthLeech)
|
||||
m_caster->DealHeal(m_caster, uint32(m_healthLeech), m_spellInfo);
|
||||
@@ -3385,7 +3389,7 @@ void Spell::SendLogExecute()
|
||||
data.append(unit->GetPackGUID());
|
||||
else
|
||||
data << uint8(0);
|
||||
data << uint32(0); // count?
|
||||
data << uint32(m_caster->m_extraAttacks);
|
||||
break;
|
||||
case SPELL_EFFECT_INTERRUPT_CAST:
|
||||
if(Unit *unit = m_targets.getUnitTarget())
|
||||
|
||||
Reference in new issue
Block a user