From 084f8f3ded45150a57eabd3ad117f1152d4d046d Mon Sep 17 00:00:00 2001
From: trickerer <onlysuffering@gmail.com>
Date: Fri, 1 Oct 2021 21:40:20 +0700
Subject: Core/Combat Improve extra attacks handling (#26859)

* Core/Combat Improve extra attacks handling

* Remove unnecessary _lastDamagedTargetGuid check

* Add missing initialization of _lastExtraAttackSpell. Do not use hardcoded spell ids.

* Partially revert 9f90b835019b
---
 src/server/game/Spells/SpellEffects.cpp | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'src/server/game/Spells/SpellEffects.cpp')

diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index 5712f1f92c1..1a910fc16d1 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -4122,10 +4122,7 @@ void Spell::EffectAddExtraAttacks()
     if (!unitTarget || !unitTarget->IsAlive())
         return;
 
-    if (unitTarget->m_extraAttacks)
-        return;
-
-    unitTarget->m_extraAttacks = damage;
+    unitTarget->AddExtraAttacks(damage);
 
     ExecuteLogEffectExtraAttacks(effectInfo->EffectIndex, unitTarget, damage);
 }
-- 
cgit v1.2.3