Fix merge fail

1 files changed, 4 insertions, 0 deletions

diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp
index 5fb4a54fac1..43504bfad58 100644
--- a/src/server/game/Maps/Map.cpp
+++ b/src/server/game/Maps/Map.cpp
@@ -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);
+                }
     }
 }