From 6954e5833bf3282533216286dee0b1c7de4d2527 Mon Sep 17 00:00:00 2001 From: hondacrx Date: Wed, 1 Jun 2022 16:07:39 -0400 Subject: [PATCH] Core/Spells: Implemented SPELL_ATTR6_DO_NOT_RESET_COOLDOWN_IN_ARENA Port From (https://github.com/TrinityCore/TrinityCore/commit/e4f8403d7a6d6f6de7ef64e8bd686587a38b68d7) --- Source/Framework/Constants/Spells/SpellConst.cs | 2 +- Source/Game/Entities/Player/Player.Spells.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Framework/Constants/Spells/SpellConst.cs b/Source/Framework/Constants/Spells/SpellConst.cs index 8a929e776..610edc99b 100644 --- a/Source/Framework/Constants/Spells/SpellConst.cs +++ b/Source/Framework/Constants/Spells/SpellConst.cs @@ -1793,7 +1793,7 @@ namespace Framework.Constants public enum SpellAttr6 : uint { 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 CanAssistImmunePc = 0x08, // Can Assist Immune Pc IgnoreForModTimeRate = 0x10, /*Nyi, Time Rate Not Implemented*/ // Ignore For Mod Time Rate diff --git a/Source/Game/Entities/Player/Player.Spells.cs b/Source/Game/Entities/Player/Player.Spells.cs index ba7eee715..55a68e01e 100644 --- a/Source/Game/Entities/Player/Player.Spells.cs +++ b/Source/Game/Entities/Player/Player.Spells.cs @@ -3107,7 +3107,7 @@ namespace Game.Entities GetSpellHistory().ResetCooldowns(p => { 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); // pet cooldowns