diff options
| author | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-09-09 18:26:31 +0200 |
|---|---|---|
| committer | Vincent-Michael <Vincent_Michael@gmx.de> | 2013-09-09 18:26:31 +0200 |
| commit | ce742dc7a07505e5e5fb015b601343b32855e325 (patch) | |
| tree | 748714fab1f817102dfebfafaa8b082e611f8cca /src/server/game/Spells/SpellEffects.cpp | |
| parent | be75ddc2bd99045e53523a06707526b233fd0c32 (diff) | |
| parent | be5cf42ec392e8526d3180e51ffaacb84e883fae (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Battlegrounds/Battleground.h
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Conditions/ConditionMgr.h
src/server/game/Guilds/Guild.cpp
Diffstat (limited to 'src/server/game/Spells/SpellEffects.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellEffects.cpp | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index b678b2334b5..6ebd872b24b 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -3578,15 +3578,6 @@ void Spell::EffectScriptEffect(SpellEffIndex effIndex) npc->LoadEquipment(); return; } - // Emblazon Runeblade - case 51770: - { - if (!m_originalCaster) - return; - - m_originalCaster->CastSpell(m_originalCaster, damage, false); - break; - } // Deathbolt from Thalgran Blightbringer // reflected by Freya's Ward // Retribution by Sevenfold Retribution |