From 48ec2df81fa8f88cd32d7a79b587603aedbd89e0 Mon Sep 17 00:00:00 2001 From: Subv Date: Sun, 1 Jun 2014 22:27:29 -0500 Subject: Core/Phases: Preliminary work with correctly implementing the phase system in 4.3.4 Put here for peer review. --- src/server/game/Handlers/MiscHandler.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/server/game/Handlers/MiscHandler.cpp') diff --git a/src/server/game/Handlers/MiscHandler.cpp b/src/server/game/Handlers/MiscHandler.cpp index e57c748b540..85d7b66d8ce 100644 --- a/src/server/game/Handlers/MiscHandler.cpp +++ b/src/server/game/Handlers/MiscHandler.cpp @@ -1750,7 +1750,7 @@ void WorldSession::HandleReadyForAccountDataTimes(WorldPacket& /*recvData*/) SendAccountDataTimes(GLOBAL_CACHE_MASK); } -void WorldSession::SendSetPhaseShift(std::set const& phaseIds, std::set const& terrainswaps) +void WorldSession::SendSetPhaseShift(std::set const& phaseIds, std::set const& terrainswaps, std::set const& worldMapAreaSwaps) { ObjectGuid guid = _player->GetGUID(); @@ -1767,9 +1767,9 @@ void WorldSession::SendSetPhaseShift(std::set const& phaseIds, std::set< data.WriteByteSeq(guid[7]); data.WriteByteSeq(guid[4]); - data << uint32(0); - //for (uint8 i = 0; i < worldMapAreaCount; ++i) - // data << uint16(0); // WorldMapArea.dbc id (controls map display) + data << uint32(worldMapAreaSwaps.size()); + for (auto mapSwap : worldMapAreaSwaps) + data << uint16(mapSwap); // WorldMapArea.dbc id (controls map display) data.WriteByteSeq(guid[1]); -- cgit v1.2.3