Merge commit https://github.com/Unholychick/TrinityCore/commit/52c0fc96bb4a8a62218bd383f360c0e1350ef62a

2 files changed, 2 insertions, 46 deletions

diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
index 8fd37b86307..94f1a5b4ea9 100644
--- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp
+++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp
@@ -379,8 +379,9 @@ pAuraEffectHandler AuraEffectHandler[TOTAL_AURAS]=
 AuraEffect::AuraEffect(Aura* base, uint8 effIndex, int32 *baseAmount, Unit* caster):
 m_base(base), m_spellInfo(base->GetSpellInfo()),
 m_baseAmount(baseAmount ? *baseAmount : m_spellInfo->Effects[effIndex].BasePoints),
+m_damage(0), m_critChance(0.0f), m_donePct(1.0f),
 m_spellmod(NULL), m_periodicTimer(0), m_tickNumber(0), m_effIndex(effIndex),
-m_canBeRecalculated(true), m_damage(0), m_critChance(0.0f), m_donePct(1.0f), m_isPeriodic(false)
+m_canBeRecalculated(true), m_isPeriodic(false)
 {
     CalculatePeriodic(caster, true, false);
 
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index 48c73cf39ca..1b1730c9aaa 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -4049,51 +4049,6 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex)
             }
             break;
         }
-        case SPELLFAMILY_DEATHKNIGHT:
-        {
-            // Pestilence
-            if (m_spellInfo->SpellFamilyFlags[1]&0x10000)
-            {
-                // Get diseases on target of spell
-                if (m_targets.GetUnitTarget() &&  // Glyph of Disease - cast on unit target too to refresh aura
-                    (m_targets.GetUnitTarget() != unitTarget || m_caster->HasAura(63334)))
-                {
-                    // And spread them on target
-                    // Blood Plague
-                    if (m_targets.GetUnitTarget()->HasAura(55078))
-                    {
-                        AuraEffect* aurEffOld = m_targets.GetUnitTarget()->GetAura(55078)->GetEffect(0);
-                        float donePct = aurEffOld->GetDonePct();
-                        float critChance = aurEffOld->GetCritChance();
-
-                        m_caster->CastSpell(unitTarget, 55078, true);
-
-                        if (unitTarget->HasAura(55078))
-                            if (AuraEffect* aurEffNew = unitTarget->GetAura(55078)->GetEffect(0))
-                            {
-                                aurEffNew->SetCritChance(critChance); // Blood Plague can crit if caster has T9.
-                                aurEffNew->SetDonePct(donePct);
-                                aurEffNew->SetDamage(m_caster->SpellDamageBonusDone(unitTarget, aurEffNew->GetSpellInfo(), std::max(aurEffNew->GetAmount(), 0), DOT) * donePct);
-                            }
-                    }
-                    // Frost Fever
-                    if (m_targets.GetUnitTarget()->HasAura(55095))
-                    {
-                        float donePct = m_targets.GetUnitTarget()->GetAura(55095)->GetEffect(0)->GetDonePct();
-
-                        m_caster->CastSpell(unitTarget, 55095, true);
-
-                        if (unitTarget->HasAura(55095))
-                            if (AuraEffect* aurEffNew = unitTarget->GetAura(55095)->GetEffect(0))
-                            {
-                                aurEffNew->SetDonePct(donePct);
-                                aurEffNew->SetDamage(m_caster->SpellDamageBonusDone(unitTarget, aurEffNew->GetSpellInfo(), std::max(aurEffNew->GetAmount(), 0), DOT) * donePct);
-                            }
-                    }
-                }
-            }
-            break;
-        }
     }
 
     // normal DB scripted effect