Core/Players: Fixed nested spell overrides (priest Mind Spike)
Port From (https://github.com/TrinityCore/TrinityCore/commit/cdca59ca4daf1edc250a96bd793cd8d4368e7f2e)
This commit is contained in:
@@ -958,9 +958,13 @@ namespace Game.Entities
|
|||||||
{
|
{
|
||||||
if (auraEffect.GetSpellInfo().HasAttribute(SpellAttr8.IgnoreSpellcastOverrideCost))
|
if (auraEffect.GetSpellInfo().HasAttribute(SpellAttr8.IgnoreSpellcastOverrideCost))
|
||||||
triggerFlag |= TriggerCastFlags.IgnorePowerAndReagentCost;
|
triggerFlag |= TriggerCastFlags.IgnorePowerAndReagentCost;
|
||||||
|
else
|
||||||
|
triggerFlag &= ~TriggerCastFlags.IgnorePowerAndReagentCost;
|
||||||
|
|
||||||
if (auraEffect.GetSpellInfo().HasAttribute(SpellAttr11.IgnoreSpellcastOverrideShapeshiftRequirements))
|
if (auraEffect.GetSpellInfo().HasAttribute(SpellAttr11.IgnoreSpellcastOverrideShapeshiftRequirements))
|
||||||
triggerFlag |= TriggerCastFlags.IgnoreShapeshift;
|
triggerFlag |= TriggerCastFlags.IgnoreShapeshift;
|
||||||
|
else
|
||||||
|
triggerFlag &= ~TriggerCastFlags.IgnoreShapeshift;
|
||||||
|
|
||||||
return info;
|
return info;
|
||||||
|
|
||||||
@@ -973,13 +977,16 @@ namespace Game.Entities
|
|||||||
|
|
||||||
SpellInfo newInfo = findMatchingAuraEffectIn(AuraType.OverrideActionbarSpells);
|
SpellInfo newInfo = findMatchingAuraEffectIn(AuraType.OverrideActionbarSpells);
|
||||||
if (newInfo != null)
|
if (newInfo != null)
|
||||||
return newInfo;
|
{
|
||||||
|
triggerFlag &= ~TriggerCastFlags.IgnoreCastTime;
|
||||||
|
return GetCastSpellInfo(newInfo, triggerFlag);
|
||||||
|
}
|
||||||
|
|
||||||
newInfo = findMatchingAuraEffectIn(AuraType.OverrideActionbarSpellsTriggered);
|
newInfo = findMatchingAuraEffectIn(AuraType.OverrideActionbarSpellsTriggered);
|
||||||
if (newInfo != null)
|
if (newInfo != null)
|
||||||
{
|
{
|
||||||
triggerFlag |= TriggerCastFlags.IgnoreCastTime;
|
triggerFlag |= TriggerCastFlags.IgnoreCastTime;
|
||||||
return newInfo;
|
return GetCastSpellInfo(newInfo, triggerFlag);
|
||||||
}
|
}
|
||||||
|
|
||||||
return spellInfo;
|
return spellInfo;
|
||||||
|
|||||||
Reference in New Issue
Block a user