diff options
Diffstat (limited to 'src')
7 files changed, 10 insertions, 2 deletions
diff --git a/src/server/game/Battlefield/Battlefield.cpp b/src/server/game/Battlefield/Battlefield.cpp index c66dbc425f0..cd1bade2bd9 100644 --- a/src/server/game/Battlefield/Battlefield.cpp +++ b/src/server/game/Battlefield/Battlefield.cpp @@ -357,6 +357,7 @@ void Battlefield::DoPlaySoundToAll(uint32 SoundID) WorldPacket data; data.Initialize(SMSG_PLAY_SOUND, 4); data << uint32(SoundID); + data << uint64(0); for (int team = 0; team < BG_TEAMS_COUNT; team++) for (GuidSet::const_iterator itr = m_PlayersInWar[team].begin(); itr != m_PlayersInWar[team].end(); ++itr) diff --git a/src/server/game/Battlegrounds/BattlegroundMgr.cpp b/src/server/game/Battlegrounds/BattlegroundMgr.cpp index 0ad4afc9028..9352b2d5710 100644 --- a/src/server/game/Battlegrounds/BattlegroundMgr.cpp +++ b/src/server/game/Battlegrounds/BattlegroundMgr.cpp @@ -659,6 +659,7 @@ void BattlegroundMgr::BuildPlaySoundPacket(WorldPacket* data, uint32 soundid) { data->Initialize(SMSG_PLAY_SOUND, 4); *data << uint32(soundid); + *data << uint64(0); } void BattlegroundMgr::BuildPlayerLeftBattlegroundPacket(WorldPacket* data, uint64 guid) diff --git a/src/server/game/Entities/Object/Object.cpp b/src/server/game/Entities/Object/Object.cpp index bcd09c4cfde..2f140081ff3 100644 --- a/src/server/game/Entities/Object/Object.cpp +++ b/src/server/game/Entities/Object/Object.cpp @@ -2348,7 +2348,8 @@ bool WorldObject::CanDetectStealthOf(WorldObject const* obj) const void WorldObject::SendPlaySound(uint32 Sound, bool OnlySelf) { WorldPacket data(SMSG_PLAY_SOUND, 4); - data << Sound; + data << uint32(Sound); + data << uint64(GetGUID()); if (OnlySelf && GetTypeId() == TYPEID_PLAYER) this->ToPlayer()->GetSession()->SendPacket(&data); else @@ -3294,6 +3295,7 @@ void WorldObject::PlayDirectSound(uint32 sound_id, Player* target /*= NULL*/) { WorldPacket data(SMSG_PLAY_SOUND, 4); data << uint32(sound_id); + data << uint64(GetGUID()); if (target) target->SendDirectMessage(&data); else diff --git a/src/server/game/Spells/SpellEffects.cpp b/src/server/game/Spells/SpellEffects.cpp index 80eadb9ac0e..44b23d7b774 100644 --- a/src/server/game/Spells/SpellEffects.cpp +++ b/src/server/game/Spells/SpellEffects.cpp @@ -5699,6 +5699,7 @@ void Spell::EffectPlaySound(SpellEffIndex effIndex) WorldPacket data(SMSG_PLAY_SOUND, 4); data << uint32(soundId); + data << uint64(m_caster->GetGUID()); unitTarget->ToPlayer()->GetSession()->SendPacket(&data); } diff --git a/src/server/game/Texts/CreatureTextMgr.cpp b/src/server/game/Texts/CreatureTextMgr.cpp index dbcfc410c1c..0887af332b1 100644 --- a/src/server/game/Texts/CreatureTextMgr.cpp +++ b/src/server/game/Texts/CreatureTextMgr.cpp @@ -353,6 +353,7 @@ void CreatureTextMgr::SendSound(Creature* source, uint32 sound, ChatMsg msgType, WorldPacket data(SMSG_PLAY_SOUND, 4); data << uint32(sound); + data << uint64(source->GetGUID()); SendNonChatPacket(source, &data, msgType, whisperGuid, range, team, gmOnly); } diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp index 210fb11a269..d9e355a0a1a 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp @@ -242,6 +242,7 @@ class instance_deadmines : public InstanceMapScript { WorldPacket data(SMSG_PLAY_SOUND, 4); data << uint32(sound); + data << uint64(unit->GetGUID()); unit->SendMessageToSet(&data, false); } }; diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp index 69645da5c9d..002ddda549d 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp @@ -222,7 +222,8 @@ public: i->getSource()->GetSession()->SendPacket(&packet); WorldPacket data2(SMSG_PLAY_SOUND, 4); - data2 << 10986; + data2 << uint32(10986); + data2 << uint64(unit->GetGUID()); i->getSource()->GetSession()->SendPacket(&data2); } } |