aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Spells/SpellMgr.cpp2
-rw-r--r--src/server/scripts/Pet/pet_hunter.cpp1
-rw-r--r--src/server/scripts/Spells/spell_dk.cpp46
-rw-r--r--src/server/scripts/Spells/spell_item.cpp33
-rw-r--r--src/server/scripts/Spells/spell_mage.cpp7
-rw-r--r--src/server/scripts/Spells/spell_warrior.cpp29
6 files changed, 2 insertions, 116 deletions
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp
index 24d7c516388..270329e56a6 100644
--- a/src/server/game/Spells/SpellMgr.cpp
+++ b/src/server/game/Spells/SpellMgr.cpp
@@ -3782,6 +3782,8 @@ void SpellMgr::LoadSpellInfoCorrections()
case 46099: // Brutal Gladiator's Totem of the Third Wind
case 46705: // Honorless Target
case 49883: // Flames
+ case 50365: // Improved Blood Presence (Rank 1)
+ case 50371: // Improved Blood Presence (Rank 2)
case 50655: // Frost Cut
case 50995: // Empowered Blood Presence (Rank 1)
case 55482: // Fire Breath (Rank 3)
diff --git a/src/server/scripts/Pet/pet_hunter.cpp b/src/server/scripts/Pet/pet_hunter.cpp
index 198f4a73a03..d7acbed9ab5 100644
--- a/src/server/scripts/Pet/pet_hunter.cpp
+++ b/src/server/scripts/Pet/pet_hunter.cpp
@@ -176,7 +176,6 @@ class spell_pet_charge : public SpellScriptLoader
void HandleDummy(AuraEffect const* /*aurEff*/, ProcEventInfo& eventInfo)
{
- // Prevent console log
PreventDefaultAction();
// Remove +% AP aura
diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp
index 08466f1e11a..a55dbd765a0 100644
--- a/src/server/scripts/Spells/spell_dk.cpp
+++ b/src/server/scripts/Spells/spell_dk.cpp
@@ -1286,18 +1286,9 @@ class spell_dk_hungering_cold : public SpellScriptLoader
return (spellInfo->Dispel != DISPEL_DISEASE);
}
- void HandleDummy(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/)
- {
- // Prevent console spam
- PreventDefaultAction();
- }
-
void Register() override
{
DoCheckProc += AuraCheckProcFn(spell_dk_hungering_cold_AuraScript::CheckProc);
-
- OnEffectProc += AuraEffectProcFn(spell_dk_hungering_cold_AuraScript::HandleDummy, EFFECT_1, SPELL_AURA_DUMMY);
- OnEffectProc += AuraEffectProcFn(spell_dk_hungering_cold_AuraScript::HandleDummy, EFFECT_2, SPELL_AURA_DUMMY);
}
};
@@ -1390,18 +1381,10 @@ class spell_dk_improved_blood_presence : public SpellScriptLoader
target->RemoveAura(SPELL_DK_IMPROVED_BLOOD_PRESENCE_TRIGGERED);
}
- void HandleProc(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/)
- {
- // Prevent console spam
- PreventDefaultAction();
- }
-
void Register() override
{
AfterEffectApply += AuraEffectApplyFn(spell_dk_improved_blood_presence_AuraScript::HandleEffectApply, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
AfterEffectRemove += AuraEffectRemoveFn(spell_dk_improved_blood_presence_AuraScript::HandleEffectRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
-
- OnEffectProc += AuraEffectProcFn(spell_dk_improved_blood_presence_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
}
};
@@ -2072,34 +2055,6 @@ class spell_dk_rime : public SpellScriptLoader
}
};
-// 56817 - Rune strike proc (Serverside spell)
-class spell_dk_rune_strike_proc : public SpellScriptLoader
-{
- public:
- spell_dk_rune_strike_proc() : SpellScriptLoader("spell_dk_rune_strike_proc") { }
-
- class spell_dk_rune_strike_proc_AuraScript : public AuraScript
- {
- PrepareAuraScript(spell_dk_rune_strike_proc_AuraScript);
-
- void HandleDummy(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/)
- {
- // Prevent console log
- PreventDefaultAction();
- }
-
- void Register() override
- {
- OnEffectProc += AuraEffectProcFn(spell_dk_rune_strike_proc_AuraScript::HandleDummy, EFFECT_0, SPELL_AURA_DUMMY);
- }
- };
-
- AuraScript* GetAuraScript() const override
- {
- return new spell_dk_rune_strike_proc_AuraScript();
- }
-};
-
// 59754 Rune Tap - Party
class spell_dk_rune_tap_party : public SpellScriptLoader
{
@@ -3068,7 +3023,6 @@ void AddSC_deathknight_spell_scripts()
new spell_dk_presence();
new spell_dk_raise_dead();
new spell_dk_rime();
- new spell_dk_rune_strike_proc();
new spell_dk_rune_tap_party();
new spell_dk_scent_of_blood();
new spell_dk_scent_of_blood_trigger();
diff --git a/src/server/scripts/Spells/spell_item.cpp b/src/server/scripts/Spells/spell_item.cpp
index ab473af09fc..6fb323074f5 100644
--- a/src/server/scripts/Spells/spell_item.cpp
+++ b/src/server/scripts/Spells/spell_item.cpp
@@ -281,38 +281,6 @@ class spell_item_arcane_shroud : public SpellScriptLoader
}
};
-// Item - 12846: Argent Dawn Commission
-// Item - 13209: Seal of the Dawn
-// Item - 19812: Rune of the Dawn
-
-// 17670 - Argent Dawn Commission
-class spell_item_argent_dawn_commission : public SpellScriptLoader
-{
- public:
- spell_item_argent_dawn_commission() : SpellScriptLoader("spell_item_argent_dawn_commission") { }
-
- class spell_item_argent_dawn_commission_AuraScript : public AuraScript
- {
- PrepareAuraScript(spell_item_argent_dawn_commission_AuraScript);
-
- void HandleDummy(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/)
- {
- // Prevent console log
- PreventDefaultAction();
- }
-
- void Register() override
- {
- OnEffectProc += AuraEffectProcFn(spell_item_argent_dawn_commission_AuraScript::HandleDummy, EFFECT_0, SPELL_AURA_DUMMY);
- }
- };
-
- AuraScript* GetAuraScript() const override
- {
- return new spell_item_argent_dawn_commission_AuraScript();
- }
-};
-
enum AuraOfMadness
{
SPELL_SOCIOPATH = 39511, // Sociopath: +35 strength(Paladin, Rogue, Druid, Warrior)
@@ -4713,7 +4681,6 @@ void AddSC_item_spell_scripts()
new spell_item_alchemists_stone();
new spell_item_anger_capacitor<8>("spell_item_tiny_abomination_in_a_jar");
new spell_item_anger_capacitor<7>("spell_item_tiny_abomination_in_a_jar_hero");
- new spell_item_argent_dawn_commission();
new spell_item_aura_of_madness();
new spell_item_dementia();
new spell_item_blessing_of_ancient_kings();
diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp
index 090a53b9b9b..72b4a323710 100644
--- a/src/server/scripts/Spells/spell_mage.cpp
+++ b/src/server/scripts/Spells/spell_mage.cpp
@@ -856,16 +856,9 @@ class spell_mage_hot_streak : public SpellScriptLoader
counter->SetAmount(25);
}
- void HandleDummy(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/)
- {
- // Prevent console spam
- PreventDefaultAction();
- }
-
void Register() override
{
OnEffectProc += AuraEffectProcFn(spell_mage_hot_streak_AuraScript::HandleProc, EFFECT_0, SPELL_AURA_DUMMY);
- OnEffectProc += AuraEffectProcFn(spell_mage_hot_streak_AuraScript::HandleDummy, EFFECT_1, SPELL_AURA_DUMMY);
}
};
diff --git a/src/server/scripts/Spells/spell_warrior.cpp b/src/server/scripts/Spells/spell_warrior.cpp
index 9431f5dbe9e..7ee2833e30f 100644
--- a/src/server/scripts/Spells/spell_warrior.cpp
+++ b/src/server/scripts/Spells/spell_warrior.cpp
@@ -1053,34 +1053,6 @@ class spell_warr_t3_prot_8p_bonus : public SpellScriptLoader
}
};
-// 32216 - Victorious
-class spell_warr_victorious : public SpellScriptLoader
-{
- public:
- spell_warr_victorious() : SpellScriptLoader("spell_warr_victorious") { }
-
- class spell_warr_victorious_AuraScript : public AuraScript
- {
- PrepareAuraScript(spell_warr_victorious_AuraScript);
-
- void HandleDummy(AuraEffect const* /*aurEff*/, ProcEventInfo& /*eventInfo*/)
- {
- // Prevent console log
- PreventDefaultAction();
- }
-
- void Register() override
- {
- OnEffectProc += AuraEffectProcFn(spell_warr_victorious_AuraScript::HandleDummy, EFFECT_0, SPELL_AURA_DUMMY);
- }
- };
-
- AuraScript* GetAuraScript() const override
- {
- return new spell_warr_victorious_AuraScript();
- }
-};
-
// 50720 - Vigilance
class spell_warr_vigilance : public SpellScriptLoader
{
@@ -1233,7 +1205,6 @@ void AddSC_warrior_spell_scripts()
new spell_warr_sweeping_strikes();
new spell_warr_sword_and_board();
new spell_warr_t3_prot_8p_bonus();
- new spell_warr_victorious();
new spell_warr_vigilance();
new spell_warr_vigilance_trigger();
}