Core/Auras: Implement SpellAuraInterruptFlags2::WarModeLeave
Port From (https://github.com/TrinityCore/TrinityCore/commit/2b231c9866db62eaab2a5806f671c7dcf22073a5)
This commit is contained in:
@@ -4748,6 +4748,7 @@ namespace Game.Entities
|
|||||||
RemovePlayerFlag(PlayerFlags.WarModeActive);
|
RemovePlayerFlag(PlayerFlags.WarModeActive);
|
||||||
CastSpell(this, auraInside, true);
|
CastSpell(this, auraInside, true);
|
||||||
RemoveAurasDueToSpell(auraOutside);
|
RemoveAurasDueToSpell(auraOutside);
|
||||||
|
RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags2.WarModeLeave);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@@ -4765,6 +4766,7 @@ namespace Game.Entities
|
|||||||
RemoveAurasDueToSpell(auraInside);
|
RemoveAurasDueToSpell(auraInside);
|
||||||
RemovePlayerFlag(PlayerFlags.WarModeActive);
|
RemovePlayerFlag(PlayerFlags.WarModeActive);
|
||||||
RemovePvpFlag(UnitPVPStateFlags.PvP);
|
RemovePvpFlag(UnitPVPStateFlags.PvP);
|
||||||
|
RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags2.WarModeLeave);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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);
|
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);
|
RemoveAurasWithInterruptFlags(SpellAuraInterruptFlags2.EndOfEncounter);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user