*Merge.

--HG--
branch : trunk

1 files changed, 5 insertions, 1 deletions

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index bcca1f2c873..14f5a1d3319 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -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())