diff options
| -rw-r--r-- | sql/updates/world/3.3.5/2018_02_23_01_world_335.sql | 1 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_paladin.cpp | 45 |
3 files changed, 3 insertions, 45 deletions
diff --git a/sql/updates/world/3.3.5/2018_02_23_01_world_335.sql b/sql/updates/world/3.3.5/2018_02_23_01_world_335.sql new file mode 100644 index 00000000000..23490ff6b6c --- /dev/null +++ b/sql/updates/world/3.3.5/2018_02_23_01_world_335.sql @@ -0,0 +1 @@ +DELETE FROM `spell_script_names` WHERE `ScriptName` IN ('spell_pal_improved_concentraction_aura_effect', 'spell_pal_improved_devotion_aura_effect', 'spell_pal_sanctified_retribution_effect'); diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 9587d9e12a6..63943db0a0e 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -3048,6 +3048,8 @@ void Unit::_DeleteRemovedAuras() delete m_removedAuras.front(); m_removedAuras.pop_front(); } + + m_removedAurasCount = 0; } void Unit::_UpdateSpells(uint32 time) diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index c8eaa11810b..4386390d49f 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -1174,48 +1174,6 @@ class spell_pal_improved_aura : public SpellScriptLoader uint32 _spellId; }; -// 63510 - Improved Concentration Aura (Area Aura) -// 63514 - Improved Devotion Aura (Area Aura) -// 63531 - Sanctified Retribution (Area Aura) -class spell_pal_improved_aura_effect : public SpellScriptLoader -{ - public: - spell_pal_improved_aura_effect(char const* name) : SpellScriptLoader(name) { } - - class spell_pal_improved_aura_effect_AuraScript : public AuraScript - { - PrepareAuraScript(spell_pal_improved_aura_effect_AuraScript); - - bool CheckAreaTarget(Unit* target) - { - Unit::AuraApplicationMap& appliedAuras = target->GetAppliedAuras(); - for (Unit::AuraApplicationMap::iterator itr = appliedAuras.begin(); itr != appliedAuras.end(); ++itr) - { - Aura const* aura = itr->second->GetBase(); - if (aura->GetSpellInfo()->GetSpellSpecific() == SPELL_SPECIFIC_AURA && aura->GetCasterGUID() == GetCasterGUID()) - { - // Not allow for Retribution Aura (prevent stacking) - Retribution Aura Overflow and Retribution Aura has same spell effects - if (GetSpellInfo()->Id == SPELL_PALADIN_SANCTIFIED_RETRIBUTION_AURA && aura->GetSpellInfo()->SpellIconID == PALADIN_ICON_ID_RETRIBUTION_AURA) - return false; - return true; - } - } - - return false; - } - - void Register() override - { - DoCheckAreaTarget += AuraCheckAreaTargetFn(spell_pal_improved_aura_effect_AuraScript::CheckAreaTarget); - } - }; - - AuraScript* GetAuraScript() const override - { - return new spell_pal_improved_aura_effect_AuraScript(); - } -}; - // -20234 - Improved Lay on Hands class spell_pal_improved_lay_of_hands : public SpellScriptLoader { @@ -2429,9 +2387,6 @@ void AddSC_paladin_spell_scripts() new spell_pal_improved_aura("spell_pal_improved_devotion_aura", SPELL_PALADIN_IMPROVED_DEVOTION_AURA); new spell_pal_improved_aura("spell_pal_sanctified_retribution", SPELL_PALADIN_SANCTIFIED_RETRIBUTION_AURA); new spell_pal_improved_aura("spell_pal_swift_retribution", SPELL_PALADIN_SANCTIFIED_RETRIBUTION_AURA); - new spell_pal_improved_aura_effect("spell_pal_improved_concentraction_aura_effect"); - new spell_pal_improved_aura_effect("spell_pal_improved_devotion_aura_effect"); - new spell_pal_improved_aura_effect("spell_pal_sanctified_retribution_effect"); new spell_pal_improved_lay_of_hands(); new spell_pal_infusion_of_light(); new spell_pal_item_healing_discount(); |