nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-03-03 07:47:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(DB/Spell): Fix Omen of Clarity not proccing from utility spells (#24783)

Browse Source 
Co-authored-by: blinkysc <blinkysc@users.noreply.github.com>
This commit is contained in:
blinkysc
2026-02-21 08:30:53 -06:00
committed by GitHub
parent 69bccd0a56
commit 16fd29c78f
2 changed files with 6 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/sql/updates/pending_db_world/rev_11390035128862920444.sql Normal file
View File

@@ -0,0 +1,2 @@
-- Omen of Clarity: revert SpellTypeMask to 0 to match TrinityCore
UPDATE `spell_proc` SET `SpellTypeMask` = 0 WHERE `SpellId` = 16864;

20
src/server/scripts/Spells/spell_druid.cpp
View File

@@ -238,44 +238,32 @@ class spell_dru_omen_of_clarity : public AuraScript
{
SpellInfo const* spellInfo = eventInfo.GetSpellInfo();
if (!spellInfo)
{
return true;
}
// Prevent passive spells to proc. (I.e shapeshift passives & passive talents)
if (spellInfo->IsPassive())
{
return false;
}
// Don't proc on crafting items.
if (spellInfo->HasEffect(SPELL_EFFECT_CREATE_ITEM))
{
return false;
}
// Reject energize spells (e.g. Furor) - they are not real casts
if (spellInfo->HasEffect(SPELL_EFFECT_ENERGIZE))
return false;
if (eventInfo.GetTypeMask() & PROC_FLAG_DONE_SPELL_MELEE_DMG_CLASS)
{
return spellInfo->HasAttribute(SPELL_ATTR0_ON_NEXT_SWING) || spellInfo->HasAttribute(SPELL_ATTR0_ON_NEXT_SWING_NO_DAMAGE);
}
// Non-damaged/Non-healing spells - only druid abilities
if (!spellInfo->HasAttribute(SpellCustomAttributes(SPELL_ATTR0_CU_DIRECT_DAMAGE | SPELL_ATTR0_CU_NO_INITIAL_THREAT)))
{
if (spellInfo->SpellFamilyName == SPELLFAMILY_DRUID)
{
// Exclude shapeshifting
return !spellInfo->HasAura(SPELL_AURA_MOD_SHAPESHIFT);
}
return false;
}
// Revitalize
if (spellInfo->SpellIconID == SPELL_ICON_REVITALIZE)
{
return false;
}
return true;
}