From d79774111623348b2f9f9b5ae54dfe02c150274b Mon Sep 17 00:00:00 2001
From: ariel- <ariel.silva305@gmail.com>
Date: Mon, 18 Jan 2016 04:13:37 -0300
Subject: [PATCH] Core/Spells: Fix Pestilence

Updates #44
---
 src/server/scripts/Spells/spell_dk.cpp | 35 +++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/server/scripts/Spells/spell_dk.cpp b/src/server/scripts/Spells/spell_dk.cpp
index c85ba2aa363..ba9efa1d819 100644
--- a/src/server/scripts/Spells/spell_dk.cpp
+++ b/src/server/scripts/Spells/spell_dk.cpp
@@ -51,7 +51,6 @@ enum DeathKnightSpells
     SPELL_DK_FROST_PRESENCE                     = 48266,
     SPELL_DK_GHOUL_EXPLODE                      = 47496,
     SPELL_DK_GLYPH_OF_ICEBOUND_FORTITUDE        = 58625,
-    SPELL_DK_GLYPH_OF_DISEASE                   = 63334,
     SPELL_DK_IMPROVED_BLOOD_PRESENCE_R1         = 50365,
     SPELL_DK_IMPROVED_DEATH_STRIKE              = 62905,
     SPELL_DK_IMPROVED_FROST_PRESENCE_R1         = 50384,
@@ -67,6 +66,8 @@ enum DeathKnightSpells
     SPELL_DK_SCENT_OF_BLOOD                     = 50422,
     SPELL_DK_SCOURGE_STRIKE_TRIGGERED           = 70890,
     SPELL_DK_UNHOLY_PRESENCE                    = 48265,
+    SPELL_DK_PESTILENCE_REDUCED_DOTS            = 76243,
+    SPELL_DK_PESTILENCE_VISUAL                  = 91939,
     SPELL_DK_WILL_OF_THE_NECROPOLIS             = 96171
 };
 
@@ -1014,13 +1015,20 @@ class spell_dk_pestilence : public SpellScriptLoader
 
             bool Validate(SpellInfo const* /*spellInfo*/) override
             {
-                if (!sSpellMgr->GetSpellInfo(SPELL_DK_GLYPH_OF_DISEASE)
+                if (!sSpellMgr->GetSpellInfo(SPELL_DK_PESTILENCE_REDUCED_DOTS)
+                    || !sSpellMgr->GetSpellInfo(SPELL_DK_PESTILENCE_VISUAL)
                     || !sSpellMgr->GetSpellInfo(SPELL_DK_BLOOD_PLAGUE)
                     || !sSpellMgr->GetSpellInfo(SPELL_DK_FROST_FEVER))
                     return false;
                 return true;
             }
 
+            bool Load() override
+            {
+                _prevTarget = nullptr;
+                return true;
+            }
+
             void OnHit(SpellEffIndex /*effIndex*/)
             {
                 Unit* caster = GetCaster();
@@ -1030,7 +1038,12 @@ class spell_dk_pestilence : public SpellScriptLoader
                 if (!victim)
                     return;
 
-                if (victim != hitUnit || caster->HasAura(SPELL_DK_GLYPH_OF_DISEASE))
+                if (_prevTarget)
+                    _prevTarget->CastSpell(hitUnit, SPELL_DK_PESTILENCE_VISUAL, true);
+
+                _prevTarget = hitUnit;
+
+                if (victim != hitUnit)
                 {
                     if (Aura* aurOld = victim->GetAura(SPELL_DK_BLOOD_PLAGUE, caster->GetGUID())) // Check Blood Plague application on victim.
                     {
@@ -1074,10 +1087,26 @@ class spell_dk_pestilence : public SpellScriptLoader
                 }
             }
 
+            void HandleAuraApply()
+            {
+                Unit* caster = GetCaster();
+                caster->CastSpell(caster, SPELL_DK_PESTILENCE_REDUCED_DOTS, true);
+            }
+
+            void HandleAuraRemoval()
+            {
+                GetCaster()->RemoveAura(SPELL_DK_PESTILENCE_REDUCED_DOTS);
+            }
+
             void Register() override
             {
+                BeforeCast += SpellCastFn(spell_dk_pestilence_SpellScript::HandleAuraApply);
                 OnEffectHitTarget += SpellEffectFn(spell_dk_pestilence_SpellScript::OnHit, EFFECT_2, SPELL_EFFECT_SCRIPT_EFFECT);
+                AfterCast += SpellCastFn(spell_dk_pestilence_SpellScript::HandleAuraRemoval);
             }
+
+        private:
+            Unit* _prevTarget;
         };
 
         SpellScript* GetSpellScript() const override