diff options
author | Subv <subv2112@gmail.com> | 2014-07-13 16:52:38 -0500 |
---|---|---|
committer | Subv <subv2112@gmail.com> | 2014-07-13 16:52:38 -0500 |
commit | dfdc19f3bc57757965d1d3b760a27622e411eb05 (patch) | |
tree | 08025cfd4bbdef881149291e926eaf1d4676f441 /src/server/game/Spells/Spell.cpp | |
parent | f14399d7887b221eb61378863c9c314adbcdebc1 (diff) |
Merge branch `master` into `boost`
Conflicts:
BattlegroundMgr.h
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
-rw-r--r-- | src/server/game/Spells/Spell.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 0d7dd8819af..d223425a027 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -1305,6 +1305,7 @@ void Spell::SelectImplicitCasterDestTargets(SpellEffIndex effIndex, SpellImplici void Spell::SelectImplicitTargetDestTargets(SpellEffIndex effIndex, SpellImplicitTargetInfo const& targetType) { + ASSERT(m_targets.GetObjectTarget() && "Spell::SelectImplicitTargetDestTargets - no explicit object target available!"); WorldObject* target = m_targets.GetObjectTarget(); SpellDestination dest(*target); |