Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Entities/DynamicObject/DynamicObject.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/shared/Utilities/Util.cpp

1 files changed, 0 insertions, 45 deletions

diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp
index 46f1413c311..be184525599 100644
--- a/src/server/game/Spells/SpellEffects.cpp
+++ b/src/server/game/Spells/SpellEffects.cpp
@@ -3748,51 +3748,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