diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-06-14 13:37:35 +0200 |
|---|---|---|
| committer | Ovahlord <dreadkiller@gmx.de> | 2024-06-20 01:20:14 +0200 |
| commit | 2cfccad14fa9eef4fc8f64da4e8ec0616a6f7453 (patch) | |
| tree | 0bbfb214a2d3776285f4d011d2cb7dcd46664c9f /src/server/game/Spells | |
| parent | cc5c68df1e0f290ef2cc4ee2933fe482f4dda645 (diff) | |
Core/Spells: Rename more SpellAttr9 to official names
(cherry picked from commit 9d4047a3be5f3de8ca7c4818c265127578dbcc81)
Diffstat (limited to 'src/server/game/Spells')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/SpellInfo.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 50a53a0cdd0..3e526db66e1 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -7030,7 +7030,7 @@ SpellCastResult Spell::CheckArenaAndRatedBattlegroundCastRules() if (m_spellInfo->HasAttribute(SPELL_ATTR4_NOT_IN_ARENA_OR_RATED_BATTLEGROUND)) return isArena ? SPELL_FAILED_NOT_IN_ARENA : SPELL_FAILED_NOT_IN_RATED_BATTLEGROUND; - if (isArena && m_spellInfo->HasAttribute(SPELL_ATTR9_NOT_USABLE_IN_ARENA)) + if (isArena && m_spellInfo->HasAttribute(SPELL_ATTR9_NOT_IN_ARENA)) return SPELL_FAILED_NOT_IN_ARENA; // check cooldowns diff --git a/src/server/game/Spells/SpellInfo.cpp b/src/server/game/Spells/SpellInfo.cpp index 7048f6e3868..c23634c67a6 100644 --- a/src/server/game/Spells/SpellInfo.cpp +++ b/src/server/game/Spells/SpellInfo.cpp @@ -3799,7 +3799,7 @@ uint32 SpellInfo::CalcCastTime(Spell* spell /*= nullptr*/) const if (spell) spell->GetCaster()->ModSpellCastTime(this, castTime, spell); - if (HasAttribute(SPELL_ATTR0_USES_RANGED_SLOT) && !IsAutoRepeatRangedSpell() && !HasAttribute(SPELL_ATTR9_AIMED_SHOT)) + if (HasAttribute(SPELL_ATTR0_USES_RANGED_SLOT) && !IsAutoRepeatRangedSpell() && !HasAttribute(SPELL_ATTR9_COOLDOWN_IGNORES_RANGED_WEAPON)) castTime += 500; return (castTime > 0) ? uint32(castTime) : 0; |