Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 09:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Packets: converted SMSG_PLAY_MUSIC to packet class and corrected packet structure

Browse Source
This commit is contained in:
Ovahlord
2020-04-07 15:51:25 +02:00
parent 77f94a456c
commit 113202ea48
5 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/server/game/Maps/Map.cpp
View File

@@ -32,6 +32,7 @@
#include "MapInstanced.h"
#include "MapManager.h"
#include "MMapFactory.h"
#include "MiscPackets.h"
#include "MotionMaster.h"
#include "ObjectAccessor.h"
#include "ObjectGridLoader.h"
@@ -4674,12 +4675,7 @@ void Map::SendZoneDynamicInfo(uint32 zoneId, Player* player) const
return;
if (uint32 music = itr->second.MusicId)
{
WorldPacket data(SMSG_PLAY_MUSIC, 4);
data << uint32(music);
data << uint64(player->GetGUID());
player->SendDirectMessage(&data);
}
player->SendDirectMessage(WorldPackets::Misc::PlayMusic(music, player->GetGUID()).Write());
SendZoneWeather(itr->second, player);
@@ -4733,12 +4729,7 @@ void Map::SetZoneMusic(uint32 zoneId, uint32 musicId)
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr)
if (Player* player = itr->GetSource())
if (player->GetZoneId() == zoneId && !player->HasAuraType(SPELL_AURA_FORCE_WEATHER))
{
WorldPacket data(SMSG_PLAY_MUSIC, 4);
data << uint32(musicId);
data << uint64(player->GetGUID());
player->SendDirectMessage(&data);
}
player->SendDirectMessage(WorldPackets::Misc::PlayMusic(musicId, player->GetGUID()).Write);
}
}