From f1850c9ebe474515568b331a53b1c1e417166bc9 Mon Sep 17 00:00:00 2001 From: pasdVn Date: Tue, 22 Dec 2009 20:28:56 +0300 Subject: [PATCH] [9046] Correctly send channeling start/update packets to clients (cherry-picked from commit 1bc38f7) Signed-off-by: VladimirMangos --- src/game/Spell.cpp | 18 ++++++------------ src/shared/revision_nr.h | 2 +- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp index 9f141df99..893e8653b 100644 --- a/src/game/Spell.cpp +++ b/src/game/Spell.cpp @@ -3463,14 +3463,11 @@ void Spell::SendChannelUpdate(uint32 time) m_caster->SetUInt32Value(UNIT_CHANNEL_SPELL, 0); } - if (m_caster->GetTypeId() != TYPEID_PLAYER) - return; - WorldPacket data( MSG_CHANNEL_UPDATE, 8+4 ); data.append(m_caster->GetPackGUID()); data << uint32(time); - ((Player*)m_caster)->GetSession()->SendPacket( &data ); + m_caster->SendMessageToSet(&data, true); } void Spell::SendChannelStart(uint32 duration) @@ -3501,15 +3498,12 @@ void Spell::SendChannelStart(uint32 duration) } } - if (m_caster->GetTypeId() == TYPEID_PLAYER) - { - WorldPacket data( MSG_CHANNEL_START, (8+4+4) ); - data.append(m_caster->GetPackGUID()); - data << uint32(m_spellInfo->Id); - data << uint32(duration); + WorldPacket data( MSG_CHANNEL_START, (8+4+4) ); + data.append(m_caster->GetPackGUID()); + data << uint32(m_spellInfo->Id); + data << uint32(duration); - ((Player*)m_caster)->GetSession()->SendPacket( &data ); - } + m_caster->SendMessageToSet(&data, true); m_timer = duration; if(target) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index a2bc8953f..a191d0cb4 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9045" + #define REVISION_NR "9046" #endif // __REVISION_NR_H__