diff options
| author | Shauren <shauren.trinity@gmail.com> | 2022-05-06 20:23:13 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2022-05-06 20:23:13 +0200 |
| commit | 94aac14b4da2d6d2b7565dfdb91313f09a87f168 (patch) | |
| tree | 394403ffdba0980d551b7934940dc1f97f0ca552 /src/server/game/Spells/Spell.cpp | |
| parent | d800c87137088f2cfdb66e8086c64321ca9c3509 (diff) | |
Core/Spells: Rename SpellAttr6 to use official attribute names
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index d2022454a8f..119585fb60b 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -491,7 +491,7 @@ protected: Spell::Spell(WorldObject* caster, SpellInfo const* info, TriggerCastFlags triggerFlags, ObjectGuid originalCasterGUID /*= ObjectGuid::Empty*/, ObjectGuid originalCastId /*= ObjectGuid::Empty*/) : -m_spellInfo(info), m_caster((info->HasAttribute(SPELL_ATTR6_CAST_BY_CHARMER) && caster->GetCharmerOrOwner()) ? caster->GetCharmerOrOwner() : caster), +m_spellInfo(info), m_caster((info->HasAttribute(SPELL_ATTR6_ORIGINATE_FROM_CONTROLLER) && caster->GetCharmerOrOwner()) ? caster->GetCharmerOrOwner() : caster), m_spellValue(new SpellValue(m_spellInfo, caster)), _spellEvent(nullptr) { m_customError = SPELL_CUSTOM_ERROR_NONE; @@ -6640,10 +6640,6 @@ SpellCastResult Spell::CheckCasterAuras(int32* param1) const if (!unitCaster) return SPELL_CAST_OK; - // spells totally immuned to caster auras (wsg flag drop, give marks etc) - if (m_spellInfo->HasAttribute(SPELL_ATTR6_IGNORE_CASTER_AURAS)) - return SPELL_CAST_OK; - // these attributes only show the spell as usable on the client when it has related aura applied // still they need to be checked against certain mechanics @@ -7963,7 +7959,7 @@ bool Spell::IsAutoActionResetSpell() const if (IsTriggered()) return false; - if (!m_casttime && m_spellInfo->HasAttribute(SPELL_ATTR6_NOT_RESET_SWING_IF_INSTANT)) + if (!m_casttime && m_spellInfo->HasAttribute(SPELL_ATTR6_DOESNT_RESET_SWING_TIMER_IF_INSTANT)) return false; return true; |