diff options
| author | Shauren <shauren.trinity@gmail.com> | 2025-01-01 19:37:48 +0100 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2025-01-01 21:05:59 +0100 |
| commit | 990e4b051865273eaf7ae41b5137dd327e352512 (patch) | |
| tree | 1bc8d979bc9f48a6de06890af205fe72736504c9 /src/server/game/Spells/Spell.cpp | |
| parent | eaf412c1bb17a445a75f3b2e754586104fbecb1c (diff) | |
Core/Spells: Don't ignore power costs and reagents for spells triggered by SPELL_EFFECT_TRIGGER_SPELL, SPELL_EFFECT_TRIGGER_MISSILE, SPELL_EFFECT_FORCE_CAST, SPELL_AURA_PERIODIC_TRIGGER_SPELL, SPELL_AURA_PROC_TRIGGER_SPELL and fixed implementation of SPELL_ATTR6_DO_NOT_CONSUME_RESOURCES
(cherry picked from commit 54a83b4b689b7d2bbddb91fc79319dd806da8cc0)
# Conflicts:
# src/server/game/Entities/Item/enuminfo_ItemDefines.cpp
# src/server/game/Spells/Spell.cpp
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 6126d7fc635..fb4e5a00c1e 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -5416,7 +5416,7 @@ void Spell::TakePower() if (!unitCaster) return; - if (m_CastItem || m_triggeredByAuraSpell) + if (m_CastItem || m_spellInfo->HasAttribute(SPELL_ATTR6_DO_NOT_CONSUME_RESOURCES)) return; //Don't take power if the spell is cast while .cheat power is enabled. @@ -5611,7 +5611,7 @@ void Spell::TakeReagents() return; // do not take reagents for these item casts - if (m_CastItem && m_CastItem->GetTemplate()->HasFlag(ITEM_FLAG_NO_REAGENT_COST)) + if ((m_CastItem && m_CastItem->GetTemplate()->HasFlag(ITEM_FLAG_NO_REAGENT_COST)) || m_spellInfo->HasAttribute(SPELL_ATTR6_DO_NOT_CONSUME_RESOURCES)) return; Player* p_caster = m_caster->ToPlayer(); |