Core/Spells: Implemented SPELL_ATTR6_DO_NOT_RESET_COOLDOWN_IN_ARENA
Port From (https://github.com/TrinityCore/TrinityCore/commit/e4f8403d7a6d6f6de7ef64e8bd686587a38b68d7)
This commit is contained in:
@@ -1793,7 +1793,7 @@ namespace Framework.Constants
|
|||||||
public enum SpellAttr6 : uint
|
public enum SpellAttr6 : uint
|
||||||
{
|
{
|
||||||
NoCooldownOnTooltip = 0x01, // No Cooldown On Tooltip (Client Only)
|
NoCooldownOnTooltip = 0x01, // No Cooldown On Tooltip (Client Only)
|
||||||
DoNotResetCooldownInArena = 0x02, /*Nyi*/ // Do Not Reset Cooldown In Arena
|
DoNotResetCooldownInArena = 0x02, // Do Not Reset Cooldown In Arena
|
||||||
NotAnAttack = 0x04, /*Nyi*/ // Not An Attack
|
NotAnAttack = 0x04, /*Nyi*/ // Not An Attack
|
||||||
CanAssistImmunePc = 0x08, // Can Assist Immune Pc
|
CanAssistImmunePc = 0x08, // Can Assist Immune Pc
|
||||||
IgnoreForModTimeRate = 0x10, /*Nyi, Time Rate Not Implemented*/ // Ignore For Mod Time Rate
|
IgnoreForModTimeRate = 0x10, /*Nyi, Time Rate Not Implemented*/ // Ignore For Mod Time Rate
|
||||||
|
|||||||
@@ -3107,7 +3107,7 @@ namespace Game.Entities
|
|||||||
GetSpellHistory().ResetCooldowns(p =>
|
GetSpellHistory().ResetCooldowns(p =>
|
||||||
{
|
{
|
||||||
SpellInfo spellInfo = Global.SpellMgr.GetSpellInfo(p.Key, Difficulty.None);
|
SpellInfo spellInfo = Global.SpellMgr.GetSpellInfo(p.Key, Difficulty.None);
|
||||||
return spellInfo.RecoveryTime < 10 * Time.Minute * Time.InMilliseconds && spellInfo.CategoryRecoveryTime < 10 * Time.Minute * Time.InMilliseconds;
|
return spellInfo.RecoveryTime < 10 * Time.Minute * Time.InMilliseconds && spellInfo.CategoryRecoveryTime < 10 * Time.Minute * Time.InMilliseconds && !spellInfo.HasAttribute(SpellAttr6.DoNotResetCooldownInArena);
|
||||||
}, true);
|
}, true);
|
||||||
|
|
||||||
// pet cooldowns
|
// pet cooldowns
|
||||||
|
|||||||
Reference in New Issue
Block a user