diff options
| author | Nay <dnpd.dd@gmail.com> | 2012-09-10 00:52:35 +0100 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2012-09-10 00:52:35 +0100 |
| commit | d6743c7c958cacb29e1948a31d1f5189a408fede (patch) | |
| tree | b64c7e5586c50afdf8599732f469aecee7232ded /src/server/game/Spells/Spell.cpp | |
| parent | 5963d02750e7b5028af80b35b4f2052ccd198d83 (diff) | |
| parent | 7a8652c06f71e430c3cff9667edcbb0335be7cc0 (diff) | |
Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
sql/updates/world/2012_09_09_02_world_spell_script_names.sql
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Vehicle/Vehicle.cpp
Diffstat (limited to 'src/server/game/Spells/Spell.cpp')
| -rwxr-xr-x | src/server/game/Spells/Spell.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index a75b0aa7598..9e25ad25e12 100755 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -4235,6 +4235,9 @@ void Spell::SendChannelUpdate(uint32 time) void Spell::SendChannelStart(uint32 duration) { uint64 channelTarget = m_targets.GetObjectTargetGUID(); + if (!channelTarget && !m_spellInfo->NeedsExplicitUnitTarget()) + if (m_UniqueTargetInfo.size() + m_UniqueGOTargetInfo.size() == 1) // this is for TARGET_SELECT_CATEGORY_NEARBY + channelTarget = !m_UniqueTargetInfo.empty() ? m_UniqueTargetInfo.front().targetGUID : m_UniqueGOTargetInfo.front().targetGUID; WorldPacket data(MSG_CHANNEL_START, (8+4+4)); data.append(m_caster->GetPackGUID()); |