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/GroupHandler.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/server/game/Handlers/GroupHandler.cpp') 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 phases; - player->GetPhaseMgr().GetActivePhases(phases); + std::set 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 phases; - player->GetPhaseMgr().GetActivePhases(phases); + std::set 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 -- cgit v1.2.3