Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-28 21:02:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge fail

Browse Source
This commit is contained in:
Vincent-Michael
2014-04-05 21:44:38 +02:00
parent e4b14b943d
commit 4043680a5e
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3449,6 +3449,7 @@ void Map::SendZoneDynamicInfo(Player* player)
{
WorldPacket data(SMSG_PLAY_MUSIC, 4);
data << uint32(music);
data << uint64(player->GetGUID());
player->SendDirectMessage(&data);
}
@@ -3487,7 +3488,10 @@ 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)
{
data << uint64(player->GetGUID());
player->SendDirectMessage(&data);
}
}
}