Core/Players: Fixed nested spell overrides (priest Mind Spike)

Port From (https://github.com/TrinityCore/TrinityCore/commit/cdca59ca4daf1edc250a96bd793cd8d4368e7f2e)
This commit is contained in:
Hondacrx
2024-11-09 23:38:32 -05:00
parent 34caf6a4da
commit 9580103f3b
+9 -2
View File
@@ -958,9 +958,13 @@ namespace Game.Entities
{
if (auraEffect.GetSpellInfo().HasAttribute(SpellAttr8.IgnoreSpellcastOverrideCost))
triggerFlag |= TriggerCastFlags.IgnorePowerAndReagentCost;
else
triggerFlag &= ~TriggerCastFlags.IgnorePowerAndReagentCost;
if (auraEffect.GetSpellInfo().HasAttribute(SpellAttr11.IgnoreSpellcastOverrideShapeshiftRequirements))
triggerFlag |= TriggerCastFlags.IgnoreShapeshift;
else
triggerFlag &= ~TriggerCastFlags.IgnoreShapeshift;
return info;
@@ -973,13 +977,16 @@ namespace Game.Entities
SpellInfo newInfo = findMatchingAuraEffectIn(AuraType.OverrideActionbarSpells);
if (newInfo != null)
return newInfo;
{
triggerFlag &= ~TriggerCastFlags.IgnoreCastTime;
return GetCastSpellInfo(newInfo, triggerFlag);
}
newInfo = findMatchingAuraEffectIn(AuraType.OverrideActionbarSpellsTriggered);
if (newInfo != null)
{
triggerFlag |= TriggerCastFlags.IgnoreCastTime;
return newInfo;
return GetCastSpellInfo(newInfo, triggerFlag);
}
return spellInfo;