Core/Combat Improve extra attacks handling

Port From (https://github.com/TrinityCore/TrinityCore/commit/6c9bde098b40f38905ea7407d0cd77437b0b953c)
2022-05-29 23:42:17 -04:00
parent 44b70d8db9
commit faa937a9da
8 changed files with 71 additions and 48 deletions
@@ -645,8 +645,16 @@ namespace Game.Spells
                    uint triggerSpellId = GetSpellEffectInfo().TriggerSpell;
                    SpellInfo triggeredSpellInfo = Global.SpellMgr.GetSpellInfo(triggerSpellId, GetBase().GetCastDifficulty());
                    if (triggeredSpellInfo != null)
-                        if (aurApp.GetTarget().ExtraAttacks != 0 && triggeredSpellInfo.HasEffect(SpellEffectName.AddExtraAttacks))
-                            return false;
+                    {
+                        if (triggeredSpellInfo.HasEffect(SpellEffectName.AddExtraAttacks))
+                        {
+                            uint lastExtraAttackSpell = eventInfo.GetActor().GetLastExtraAttackSpell();
+
+                            // Patch 1.12.0(?) extra attack abilities can no longer chain proc themselves
+                            if (lastExtraAttackSpell == triggerSpellId)
+                                return false;
+                        }
+                    }
                    break;
                }
                case AuraType.ModSpellCritChance: