diff options
author | DDuarte <dnpd.dd@gmail.com> | 2014-01-11 23:29:27 +0000 |
---|---|---|
committer | DDuarte <dnpd.dd@gmail.com> | 2014-01-11 23:29:27 +0000 |
commit | b204d71cb439248731d282258f8afd155f35384a (patch) | |
tree | de144f32c38209158477c1ee16538f783af33ec0 /src/server/game/Maps/Map.cpp | |
parent | ced89d7c682c6d4bbd10be1b48182be17192bd75 (diff) |
Core: Fix build due to merge resolution errors
Diffstat (limited to 'src/server/game/Maps/Map.cpp')
-rw-r--r-- | src/server/game/Maps/Map.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Maps/Map.cpp b/src/server/game/Maps/Map.cpp index 73f83fb858c..01c7e712f3d 100644 --- a/src/server/game/Maps/Map.cpp +++ b/src/server/game/Maps/Map.cpp @@ -566,7 +566,7 @@ bool Map::AddToMap(Transport* obj) { if (itr->GetSource()->GetTransport() != obj) { - UpdateData data; + UpdateData data(i_mapEntry->MapID); obj->BuildCreateUpdateBlockForPlayer(&data, itr->GetSource()); WorldPacket packet; data.BuildPacket(&packet); @@ -826,7 +826,7 @@ void Map::RemoveFromMap(Transport* obj, bool remove) Map::PlayerList const& players = GetPlayers(); if (!players.isEmpty()) { - UpdateData data; + UpdateData data(i_mapEntry->MapID); obj->BuildOutOfRangeUpdateBlock(&data); WorldPacket packet; data.BuildPacket(&packet); |