Messed up the commit history, so here is all the files rip, Credit to TrinityCore

2023-09-16 08:42:35 -04:00
parent 87284bbded
commit f636ea225f
373 changed files with 158910 additions and 2170 deletions
@@ -589,18 +589,39 @@ namespace Game.Entities
            return GetTransport();
        }

-        public void AtStartOfEncounter()
+        public void AtStartOfEncounter(EncounterType type)
        {
            RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags2.StartOfEncounter);

+            switch (type)
+            {
+                case EncounterType.DungeonEncounter:
+                    RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags2.StartOfDungeonEncounter);
+                    break;
+                case EncounterType.MythicPlusRun:
+                    RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags2.StartOfMythicPlusRun);
+                    break;
+                default:
+                    break;
+            }
+
            if (IsAlive())
                Unit.ProcSkillsAndAuras(this, null, new ProcFlagsInit(ProcFlags.EncounterStart), new ProcFlagsInit(), ProcFlagsSpellType.MaskAll, ProcFlagsSpellPhase.None, ProcFlagsHit.None, null, null, null);
        }

-        public void AtEndOfEncounter()
+        public void AtEndOfEncounter(EncounterType type)
        {
            RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags2.EndOfEncounter);

+            switch (type)
+            {
+                case EncounterType.DungeonEncounter:
+                    RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags2.EndOfDungeonEncounter);
+                    break;
+                default:
+                    break;
+            }
+
            GetSpellHistory().ResetCooldowns(pair =>
            {
                SpellInfo spellInfo = Global.SpellMgr.GetSpellInfo(pair.Key, Difficulty.None);