diff options
author | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-05 14:28:58 +0200 |
---|---|---|
committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2014-07-05 14:28:58 +0200 |
commit | a508ce1976caaf8ede6afcea7e8a857399f548ef (patch) | |
tree | a74648a065e92da70251066a99ecda387a9fe1a2 /src/server/game/Spells/SpellEffects.cpp | |
parent | 6d93a0a810c9d092797a5016738576d03005d1b7 (diff) | |
parent | d28b66bca88de621fd00495e4edc7e4d9d01e7eb (diff) |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
Diffstat (limited to 'src/server/game/Spells/SpellEffects.cpp')
-rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index ebd0a269223..98ee85dce84 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -531,14 +531,6 @@ void Spell::EffectSchoolDMG(SpellEffIndex effIndex) } break; } - case SPELLFAMILY_MAGE: - { - // Deep Freeze should deal damage to permanently stun-immune targets. - if (m_spellInfo->Id == 71757) - if (unitTarget->GetTypeId() != TYPEID_UNIT || !(unitTarget->IsImmunedToSpellEffect(sSpellMgr->GetSpellInfo(44572), 0))) - return; - break; - } } if (m_originalCaster && damage > 0 && apply_direct_bonus) |