diff options
| author | Subv <subv2112@gmail.com> | 2014-06-01 22:27:29 -0500 |
|---|---|---|
| committer | Subv <subv2112@gmail.com> | 2014-06-01 22:27:29 -0500 |
| commit | 48ec2df81fa8f88cd32d7a79b587603aedbd89e0 (patch) | |
| tree | 1a6404c63979ee20a39f8b577db21541b37739c5 /src/server/game/Handlers/GroupHandler.cpp | |
| parent | 6bc62d730ed08e6e12d9b57d4914e98019298781 (diff) | |
Core/Phases: Preliminary work with correctly implementing the phase system in 4.3.4
Put here for peer review.
Diffstat (limited to 'src/server/game/Handlers/GroupHandler.cpp')
| -rw-r--r-- | src/server/game/Handlers/GroupHandler.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/server/game/Handlers/GroupHandler.cpp b/src/server/game/Handlers/GroupHandler.cpp index dcaa2727b5e..7ef56ff94b4 100644 --- a/src/server/game/Handlers/GroupHandler.cpp +++ b/src/server/game/Handlers/GroupHandler.cpp @@ -32,6 +32,7 @@ #include "World.h" #include "WorldPacket.h" #include "WorldSession.h" +#include "SpellAuraEffects.h" class Aura; @@ -946,8 +947,7 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player* player, WorldPacke if (mask == GROUP_UPDATE_FLAG_NONE) return; - std::set<uint32> phases; - player->GetPhaseMgr().GetActivePhases(phases); + std::set<uint32> const& phases = player->GetPhases(); if (mask & GROUP_UPDATE_FLAG_POWER_TYPE) // if update power type, update current/max power also mask |= (GROUP_UPDATE_FLAG_CUR_POWER | GROUP_UPDATE_FLAG_MAX_POWER); @@ -1199,8 +1199,7 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket& recvData) Pet* pet = player->GetPet(); Powers powerType = player->getPowerType(); - std::set<uint32> phases; - player->GetPhaseMgr().GetActivePhases(phases); + std::set<uint32> const& phases = player->GetPhases(); WorldPacket data(SMSG_PARTY_MEMBER_STATS_FULL, 4+2+2+2+1+2*6+8+1+8); data << uint8(0); // only for SMSG_PARTY_MEMBER_STATS_FULL, probably arena/bg related |