Core/Entities: Phase Rework (main commit)
This commit is contained in:
1 parent
4a268b3fd3
commit
e44bb5f387
79 files changed
+1738
-851
No files matched your search
@@ -24,6 +24,7 @@
|
||||
#include "Log.h"
|
||||
#include "ObjectMgr.h"
|
||||
#include "Pet.h"
|
||||
#include "PhasingHandler.h"
|
||||
#include "Player.h"
|
||||
#include "SocialMgr.h"
|
||||
#include "SpellAuras.h"
|
||||
@@ -984,8 +985,6 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player* player, WorldPacke
|
||||
if (mask == GROUP_UPDATE_FLAG_NONE)
|
||||
return;
|
||||
|
||||
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);
|
||||
|
||||
@@ -1207,12 +1206,7 @@ void WorldSession::BuildPartyMemberStatsChangedPacket(Player* player, WorldPacke
|
||||
}
|
||||
|
||||
if (mask & GROUP_UPDATE_FLAG_PHASE)
|
||||
{
|
||||
*data << uint32(phases.empty() ? 8 : 0);
|
||||
*data << uint32(phases.size());
|
||||
for (std::set<uint32>::const_iterator itr = phases.begin(); itr != phases.end(); ++itr)
|
||||
*data << uint16(*itr);
|
||||
}
|
||||
PhasingHandler::FillPartyMemberPhase(data, player->GetPhaseShift());
|
||||
}
|
||||
|
||||
/*this procedure handles clients CMSG_REQUEST_PARTY_MEMBER_STATS request*/
|
||||
@@ -1236,7 +1230,6 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket& recvData)
|
||||
|
||||
Pet* pet = player->GetPet();
|
||||
Powers powerType = player->getPowerType();
|
||||
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
|
||||
@@ -1257,7 +1250,7 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket& recvData)
|
||||
if (player->GetVehicle())
|
||||
updateFlags |= GROUP_UPDATE_FLAG_VEHICLE_SEAT;
|
||||
|
||||
if (!phases.empty())
|
||||
if (!player->GetPhaseShift().GetPhases().empty())
|
||||
updateFlags |= GROUP_UPDATE_FLAG_PHASE;
|
||||
|
||||
uint16 playerStatus = MEMBER_STATUS_ONLINE;
|
||||
@@ -1385,12 +1378,7 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket& recvData)
|
||||
data << uint32(player->GetVehicle()->GetVehicleInfo()->m_seatID[player->m_movementInfo.transport.seat]);
|
||||
|
||||
if (updateFlags & GROUP_UPDATE_FLAG_PHASE)
|
||||
{
|
||||
data << uint32(phases.empty() ? 8 : 0);
|
||||
data << uint32(phases.size());
|
||||
for (std::set<uint32>::const_iterator itr = phases.begin(); itr != phases.end(); ++itr)
|
||||
data << uint16(*itr);
|
||||
}
|
||||
PhasingHandler::FillPartyMemberPhase(&data, player->GetPhaseShift());
|
||||
|
||||
SendPacket(&data);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user