From 89f0c42c0e1479c0a77134ad2287548a78ee2e19 Mon Sep 17 00:00:00 2001 From: UltraNix <80540499+UltraNix@users.noreply.github.com> Date: Sat, 9 Oct 2021 18:49:45 +0200 Subject: [PATCH] fix(Core/Spells): Restore dafef5bd78 (#8380) Fixes #5475 --- src/server/game/Entities/Player/Player.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 85934b8ef..29994d518 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -10234,6 +10234,13 @@ void Player::AddSpellAndCategoryCooldowns(SpellInfo const* spellInfo, uint32 ite continue; } + // Only within the same spellfamily + SpellInfo const* categorySpellInfo = sSpellMgr->GetSpellInfo(i_scset->first); + if (!categorySpellInfo || categorySpellInfo->SpellFamilyName != spellInfo->SpellFamilyName) + { + continue; + } + _AddSpellCooldown(i_scset->second, cat, itemId, catrecTime, !spellInfo->IsCooldownStartedOnEvent() && catrec && rec && catrec != rec); } }