Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/Auras: Interrupt spells with SPELL_PREVENTION_TYPE_PACIFY when applying SPELL_AURA_MOD_PACIFY

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/150d6995bdc966a5118e65d9bf6b6171faf9c62c)
This commit is contained in:
Hondacrx
2025-08-12 21:57:01 -04:00
parent 51b9b1e85c
commit dcfe78ba77
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Spells/Auras/AuraEffect.cs
+20 -18
View File
@@ -1904,6 +1904,19 @@ namespace Game.Spells
target.UpdateDamagePhysical(attType); target.UpdateDamagePhysical(attType);
} }
static void InterruptSpellsWithPreventionTypeOnAuraApply(Unit target, SpellPreventionType preventionType)
{
// Stop cast only spells vs PreventionType
for (var i = CurrentSpellTypes.Melee; i < CurrentSpellTypes.Max; ++i)
{
Spell spell = target.GetCurrentSpell(i);
if (spell != null)
if ((spell.m_spellInfo.PreventionType & preventionType) != 0)
// Stop spells on prepare or casting state
target.InterruptSpell(i, false);
}
}
[AuraEffectHandler(AuraType.ModSilence)] [AuraEffectHandler(AuraType.ModSilence)]
void HandleAuraModSilence(AuraApplication aurApp, AuraEffectHandleModes mode, bool apply) void HandleAuraModSilence(AuraApplication aurApp, AuraEffectHandleModes mode, bool apply)
{ {
@@ -1917,15 +1930,7 @@ namespace Game.Spells
target.SetSilencedSchoolMask((SpellSchoolMask)GetMiscValue()); target.SetSilencedSchoolMask((SpellSchoolMask)GetMiscValue());
// call functions which may have additional effects after changing state of unit // call functions which may have additional effects after changing state of unit
// Stop cast only spells vs PreventionType & SPELL_PREVENTION_TYPE_NO_ACTIONS InterruptSpellsWithPreventionTypeOnAuraApply(target, SpellPreventionType.Silence);
for (var i = CurrentSpellTypes.Melee; i < CurrentSpellTypes.Max; ++i)
{
Spell spell = target.GetCurrentSpell(i);
if (spell != null)
if (spell.m_spellInfo.PreventionType.HasAnyFlag(SpellPreventionType.Silence))
// Stop spells on prepare or casting state
target.InterruptSpell(i, false);
}
} }
else else
{ {
@@ -1949,7 +1954,12 @@ namespace Game.Spells
Unit target = aurApp.GetTarget(); Unit target = aurApp.GetTarget();
if (apply) if (apply)
{
target.SetUnitFlag(UnitFlags.Pacified); target.SetUnitFlag(UnitFlags.Pacified);
// call functions which may have additional effects after changing state of unit
InterruptSpellsWithPreventionTypeOnAuraApply(target, SpellPreventionType.Pacify);
}
else else
{ {
// do not remove unit flag if there are more than this auraEffect of that kind on unit on unit // do not remove unit flag if there are more than this auraEffect of that kind on unit on unit
@@ -1999,15 +2009,7 @@ namespace Game.Spells
target.SetUnitFlag2(UnitFlags2.NoActions); target.SetUnitFlag2(UnitFlags2.NoActions);
// call functions which may have additional effects after changing state of unit // call functions which may have additional effects after changing state of unit
// Stop cast only spells vs PreventionType & SPELL_PREVENTION_TYPE_SILENCE InterruptSpellsWithPreventionTypeOnAuraApply(target, SpellPreventionType.NoActions);
for (var i = CurrentSpellTypes.Melee; i < CurrentSpellTypes.Max; ++i)
{
Spell spell = target.GetCurrentSpell(i);
if (spell != null)
if (spell.m_spellInfo.PreventionType.HasAnyFlag(SpellPreventionType.NoActions))
// Stop spells on prepare or casting state
target.InterruptSpell(i, false);
}
} }
else else
{ {