From 0cfe1dc5081e8428ea4ff0118622afe8aa9bd14e Mon Sep 17 00:00:00 2001 From: hondacrx Date: Sun, 21 May 2023 17:21:22 -0400 Subject: [PATCH] Core/Auras: Implement SpellAuraInterruptFlags2::WarModeLeave Port From (https://github.com/TrinityCore/TrinityCore/commit/2b231c9866db62eaab2a5806f671c7dcf22073a5) --- Source/Game/Entities/Player/Player.cs | 2 ++ Source/Game/Entities/Unit/Unit.cs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Source/Game/Entities/Player/Player.cs b/Source/Game/Entities/Player/Player.cs index 3cc0d9aed..aeffe3c16 100644 --- a/Source/Game/Entities/Player/Player.cs +++ b/Source/Game/Entities/Player/Player.cs @@ -4748,6 +4748,7 @@ namespace Game.Entities RemovePlayerFlag(PlayerFlags.WarModeActive); CastSpell(this, auraInside, true); RemoveAurasDueToSpell(auraOutside); + RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags2.WarModeLeave); } else { @@ -4765,6 +4766,7 @@ namespace Game.Entities RemoveAurasDueToSpell(auraInside); RemovePlayerFlag(PlayerFlags.WarModeActive); RemovePvpFlag(UnitPVPStateFlags.PvP); + RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags2.WarModeLeave); } } diff --git a/Source/Game/Entities/Unit/Unit.cs b/Source/Game/Entities/Unit/Unit.cs index aefd03b00..3e87a2fab 100644 --- a/Source/Game/Entities/Unit/Unit.cs +++ b/Source/Game/Entities/Unit/Unit.cs @@ -591,7 +591,7 @@ namespace Game.Entities Unit.ProcSkillsAndAuras(this, null, new ProcFlagsInit(ProcFlags.EncounterStart), new ProcFlagsInit(), ProcFlagsSpellType.MaskAll, ProcFlagsSpellPhase.None, ProcFlagsHit.None, null, null, null); } - void AtEndOfEncounter() + public void AtEndOfEncounter() { RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags2.EndOfEncounter); }