diff options
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 43 |
1 files changed, 2 insertions, 41 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 0086030683f..1bb329d982d 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -16,7 +16,6 @@ */ #include "Spell.h" -#include "AzeriteEmpoweredItem.h" #include "Battlefield.h" #include "BattlefieldMgr.h" #include "Battleground.h" @@ -6856,7 +6855,8 @@ SpellCastResult Spell::CheckCasterAuras(int32* param1) const else if ((m_spellInfo->Mechanic & MECHANIC_IMMUNE_SHIELD) && m_caster->ToUnit() && m_caster->ToUnit()->HasAuraWithMechanic(1 << MECHANIC_BANISH)) result = SPELL_FAILED_STUNNED; } - else if (unitCaster->IsSilenced(m_spellSchoolMask) && m_spellInfo->PreventionType & SPELL_PREVENTION_TYPE_SILENCE && !CheckSpellCancelsSilence(param1)) + // @TODO: Fix for 4.4.0 + else if (/*unitCaster->HasUnitFlag(UNIT_FLAG_SILENCED) &&*/ m_spellInfo->PreventionType & SPELL_PREVENTION_TYPE_SILENCE && !CheckSpellCancelsSilence(param1)) result = SPELL_FAILED_SILENCED; else if (unitflag & UNIT_FLAG_PACIFIED && m_spellInfo->PreventionType & SPELL_PREVENTION_TYPE_PACIFY && !CheckSpellCancelsPacify(param1)) result = SPELL_FAILED_PACIFIED; @@ -7735,37 +7735,6 @@ SpellCastResult Spell::CheckItems(int32* param1 /*= nullptr*/, int32* param2 /*= return SPELL_FAILED_ITEM_AT_MAX_CHARGES; break; } - case SPELL_EFFECT_RESPEC_AZERITE_EMPOWERED_ITEM: - { - Item const* item = m_targets.GetItemTarget(); - if (!item) - return SPELL_FAILED_AZERITE_EMPOWERED_ONLY; - - if (item->GetOwnerGUID() != m_caster->GetGUID()) - return SPELL_FAILED_DONT_REPORT; - - AzeriteEmpoweredItem const* azeriteEmpoweredItem = item->ToAzeriteEmpoweredItem(); - if (!azeriteEmpoweredItem) - return SPELL_FAILED_AZERITE_EMPOWERED_ONLY; - - bool hasSelections = false; - for (int32 tier = 0; tier < MAX_AZERITE_EMPOWERED_TIER; ++tier) - { - if (azeriteEmpoweredItem->GetSelectedAzeritePower(tier)) - { - hasSelections = true; - break; - } - } - - if (!hasSelections) - return SPELL_FAILED_AZERITE_EMPOWERED_NO_CHOICES_TO_UNDO; - - if (!m_caster->ToPlayer()->HasEnoughMoney(azeriteEmpoweredItem->GetRespecCost())) - return SPELL_FAILED_DONT_REPORT; - - break; - } default: break; } @@ -9360,14 +9329,6 @@ CastSpellExtraArgs& CastSpellExtraArgs::SetTriggeringAura(AuraEffect const* trig return *this; } -SpellCastVisual::operator UF::SpellCastVisual() const -{ - UF::SpellCastVisual visual; - visual.SpellXSpellVisualID = SpellXSpellVisualID; - visual.ScriptVisualID = ScriptVisualID; - return visual; -} - SpellCastVisual::operator WorldPackets::Spells::SpellCastVisual() const { return { int32(SpellXSpellVisualID), int32(ScriptVisualID) }; |