Core/Packets: converted SMSG_PARTY_MEMBER_STATE and SMSG_PARTY_MEMBER_FULL_STATE to packet class
* handle GROUP_UPDATE_FLAG_PHASE when changing phases * define and implement GROUP_UPDATE_FLAG_WMO_GROUP_ID
This commit is contained in:
1 parent
4f50bafd03
commit
c3831d30e5
15 files changed
+452
-409
No files matched your search
@@ -24,6 +24,7 @@
|
||||
#include "Log.h"
|
||||
#include "ObjectAccessor.h"
|
||||
#include "ObjectMgr.h"
|
||||
#include "PartyPackets.h"
|
||||
#include "Pet.h"
|
||||
#include "PhasingHandler.h"
|
||||
#include "Player.h"
|
||||
@@ -982,237 +983,6 @@ void WorldSession::HandleRaidReadyCheckFinishedOpcode(WorldPacket& /*recvData*/)
|
||||
// Is any reaction need?
|
||||
}
|
||||
|
||||
void WorldSession::BuildPartyMemberStatsChangedPacket(Player* player, WorldPacket* data)
|
||||
{
|
||||
uint32 mask = player->GetGroupUpdateFlag();
|
||||
|
||||
if (mask == GROUP_UPDATE_FLAG_NONE)
|
||||
return;
|
||||
|
||||
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);
|
||||
|
||||
if (mask & GROUP_UPDATE_FLAG_PET_POWER_TYPE) // same for pets
|
||||
mask |= (GROUP_UPDATE_FLAG_PET_CUR_POWER | GROUP_UPDATE_FLAG_PET_MAX_POWER);
|
||||
|
||||
data->Initialize(SMSG_PARTY_MEMBER_STATS, 80); // average value
|
||||
*data << player->GetPackGUID();
|
||||
*data << uint32(mask);
|
||||
|
||||
if (mask & GROUP_UPDATE_FLAG_STATUS)
|
||||
{
|
||||
uint16 playerStatus = MEMBER_STATUS_ONLINE;
|
||||
if (player->IsPvP())
|
||||
playerStatus |= MEMBER_STATUS_PVP;
|
||||
|
||||
if (!player->IsAlive())
|
||||
{
|
||||
if (player->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
|
||||
playerStatus |= MEMBER_STATUS_GHOST;
|
||||
else
|
||||
playerStatus |= MEMBER_STATUS_DEAD;
|
||||
}
|
||||
|
||||
if (player->IsFFAPvP())
|
||||
playerStatus |= MEMBER_STATUS_PVP_FFA;
|
||||
|
||||
if (player->isAFK())
|
||||
playerStatus |= MEMBER_STATUS_AFK;
|
||||
|
||||
if (player->isDND())
|
||||
playerStatus |= MEMBER_STATUS_DND;
|
||||
|
||||
*data << uint16(playerStatus);
|
||||
}
|
||||
|
||||
if (mask & GROUP_UPDATE_FLAG_CUR_HP)
|
||||
*data << int32(player->GetHealth());
|
||||
|
||||
if (mask & GROUP_UPDATE_FLAG_MAX_HP)
|
||||
*data << int32(player->GetMaxHealth());
|
||||
|
||||
Powers powerType = player->GetPowerType();
|
||||
if (mask & GROUP_UPDATE_FLAG_POWER_TYPE)
|
||||
*data << uint8(powerType);
|
||||
|
||||
if (mask & GROUP_UPDATE_FLAG_CUR_POWER)
|
||||
*data << int16(player->GetPower(powerType));
|
||||
|
||||
if (mask & GROUP_UPDATE_FLAG_MAX_POWER)
|
||||
*data << int16(player->GetMaxPower(powerType));
|
||||
|
||||
if (mask & GROUP_UPDATE_FLAG_LEVEL)
|
||||
*data << int16(player->getLevel());
|
||||
|
||||
if (mask & GROUP_UPDATE_FLAG_ZONE)
|
||||
*data << int16(player->GetZoneId());
|
||||
|
||||
if (mask & GROUP_UPDATE_FLAG_UNK100)
|
||||
*data << uint16(0);
|
||||
|
||||
if (mask & GROUP_UPDATE_FLAG_POSITION)
|
||||
{
|
||||
*data << uint16(player->GetPositionX());
|
||||
*data << uint16(player->GetPositionY());
|
||||
*data << uint16(player->GetPositionZ());
|
||||
}
|
||||
|
||||
if (mask & GROUP_UPDATE_FLAG_AURAS)
|
||||
{
|
||||
*data << uint8(0);
|
||||
uint64 auramask = player->GetAuraUpdateMaskForRaid();
|
||||
*data << uint64(auramask);
|
||||
*data << uint32(MAX_AURAS); // count
|
||||
for (uint32 i = 0; i < MAX_AURAS; ++i)
|
||||
{
|
||||
if (auramask & (uint64(1) << i))
|
||||
{
|
||||
AuraApplication const* aurApp = player->GetVisibleAura(i);
|
||||
if (!aurApp)
|
||||
{
|
||||
*data << uint32(0);
|
||||
*data << uint16(0);
|
||||
continue;
|
||||
}
|
||||
|
||||
*data << uint32(aurApp->GetBase()->GetId());
|
||||
*data << uint16(aurApp->GetFlags());
|
||||
|
||||
if (aurApp->GetFlags() & AFLAG_ANY_EFFECT_AMOUNT_SENT)
|
||||
{
|
||||
for (uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i)
|
||||
{
|
||||
if (AuraEffect const* eff = aurApp->GetBase()->GetEffect(i))
|
||||
*data << int32(eff->GetAmount());
|
||||
else
|
||||
*data << int32(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Pet* pet = player->GetPet();
|
||||
if (mask & GROUP_UPDATE_FLAG_PET_GUID)
|
||||
{
|
||||
if (pet)
|
||||
*data << uint64(pet->GetGUID());
|
||||
else
|
||||
*data << uint64(0);
|
||||
}
|
||||
|
||||
if (mask & GROUP_UPDATE_FLAG_PET_NAME)
|
||||
{
|
||||
if (pet)
|
||||
*data << pet->GetName();
|
||||
else
|
||||
*data << uint8(0);
|
||||
}
|
||||
|
||||
if (mask & GROUP_UPDATE_FLAG_PET_MODEL_ID)
|
||||
{
|
||||
if (pet)
|
||||
*data << int16(pet->GetDisplayId());
|
||||
else
|
||||
*data << uint16(0);
|
||||
}
|
||||
|
||||
if (mask & GROUP_UPDATE_FLAG_PET_CUR_HP)
|
||||
{
|
||||
if (pet)
|
||||
*data << int32(pet->GetHealth());
|
||||
else
|
||||
*data << int32(0);
|
||||
}
|
||||
|
||||
if (mask & GROUP_UPDATE_FLAG_PET_MAX_HP)
|
||||
{
|
||||
if (pet)
|
||||
*data << int32(pet->GetMaxHealth());
|
||||
else
|
||||
*data << int32(0);
|
||||
}
|
||||
|
||||
if (mask & GROUP_UPDATE_FLAG_PET_POWER_TYPE)
|
||||
{
|
||||
if (pet)
|
||||
*data << uint8(pet->GetPowerType());
|
||||
else
|
||||
*data << uint8(0);
|
||||
}
|
||||
|
||||
if (mask & GROUP_UPDATE_FLAG_PET_CUR_POWER)
|
||||
{
|
||||
if (pet)
|
||||
*data << int16(pet->GetPower(pet->GetPowerType()));
|
||||
else
|
||||
*data << int16(0);
|
||||
}
|
||||
|
||||
if (mask & GROUP_UPDATE_FLAG_PET_MAX_POWER)
|
||||
{
|
||||
if (pet)
|
||||
*data << int16(pet->GetMaxPower(pet->GetPowerType()));
|
||||
else
|
||||
*data << int16(0);
|
||||
}
|
||||
|
||||
if (mask & GROUP_UPDATE_FLAG_PET_AURAS)
|
||||
{
|
||||
if (pet)
|
||||
{
|
||||
*data << uint8(0);
|
||||
uint64 auramask = pet->GetAuraUpdateMaskForRaid();
|
||||
*data << uint64(auramask);
|
||||
*data << uint32(MAX_AURAS); // count
|
||||
for (uint32 i = 0; i < MAX_AURAS; ++i)
|
||||
{
|
||||
if (auramask & (uint64(1) << i))
|
||||
{
|
||||
AuraApplication const* aurApp = pet->GetVisibleAura(i);
|
||||
if (!aurApp)
|
||||
{
|
||||
*data << uint32(0);
|
||||
*data << uint16(0);
|
||||
continue;
|
||||
}
|
||||
|
||||
*data << uint32(aurApp->GetBase()->GetId());
|
||||
*data << uint16(aurApp->GetFlags());
|
||||
|
||||
if (aurApp->GetFlags() & AFLAG_ANY_EFFECT_AMOUNT_SENT)
|
||||
{
|
||||
for (uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i)
|
||||
{
|
||||
if (AuraEffect const* eff = aurApp->GetBase()->GetEffect(i))
|
||||
*data << int32(eff->GetAmount());
|
||||
else
|
||||
*data << int32(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
*data << uint8(0);
|
||||
*data << uint64(0);
|
||||
*data << uint32(0);
|
||||
}
|
||||
}
|
||||
|
||||
if (mask & GROUP_UPDATE_FLAG_VEHICLE_SEAT)
|
||||
{
|
||||
if (Vehicle* veh = player->GetVehicle())
|
||||
*data << int32(veh->GetVehicleInfo()->SeatID[player->m_movementInfo.transport.seat]);
|
||||
else
|
||||
*data << int32(0);
|
||||
}
|
||||
|
||||
if (mask & GROUP_UPDATE_FLAG_PHASE)
|
||||
PhasingHandler::FillPartyMemberPhase(data, player->GetPhaseShift());
|
||||
}
|
||||
|
||||
/*this procedure handles clients CMSG_REQUEST_PARTY_MEMBER_STATS request*/
|
||||
void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket& recvData)
|
||||
{
|
||||
@@ -1223,168 +993,17 @@ void WorldSession::HandleRequestPartyMemberStatsOpcode(WorldPacket& recvData)
|
||||
Player* player = ObjectAccessor::FindConnectedPlayer(Guid);
|
||||
if (!player)
|
||||
{
|
||||
WorldPacket data(SMSG_PARTY_MEMBER_STATS_FULL, 3+4+2);
|
||||
data << uint8(0); // only for SMSG_PARTY_MEMBER_STATS_FULL, probably arena/bg related
|
||||
data << Guid.WriteAsPacked();
|
||||
data << uint32(GROUP_UPDATE_FLAG_STATUS);
|
||||
data << uint16(MEMBER_STATUS_OFFLINE);
|
||||
SendPacket(&data);
|
||||
WorldPackets::Party::PartyMemberState packet(true);
|
||||
packet.MemberGuid = Guid;
|
||||
packet.ChangeMask = GROUP_UPDATE_FLAG_STATUS;
|
||||
packet.MemberStats.Status = MEMBER_STATUS_OFFLINE;
|
||||
SendPacket(packet.Write());
|
||||
return;
|
||||
}
|
||||
|
||||
Pet* pet = player->GetPet();
|
||||
Powers powerType = player->GetPowerType();
|
||||
|
||||
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
|
||||
data << player->GetPackGUID();
|
||||
|
||||
uint32 updateFlags = GROUP_UPDATE_FLAG_STATUS | GROUP_UPDATE_FLAG_CUR_HP | GROUP_UPDATE_FLAG_MAX_HP
|
||||
| GROUP_UPDATE_FLAG_CUR_POWER | GROUP_UPDATE_FLAG_MAX_POWER | GROUP_UPDATE_FLAG_LEVEL
|
||||
| GROUP_UPDATE_FLAG_ZONE | GROUP_UPDATE_FLAG_POSITION | GROUP_UPDATE_FLAG_AURAS
|
||||
| GROUP_UPDATE_FLAG_PET_NAME | GROUP_UPDATE_FLAG_PET_MODEL_ID | GROUP_UPDATE_FLAG_PET_AURAS;
|
||||
|
||||
if (powerType != POWER_MANA)
|
||||
updateFlags |= GROUP_UPDATE_FLAG_POWER_TYPE;
|
||||
|
||||
if (pet)
|
||||
updateFlags |= GROUP_UPDATE_FLAG_PET_GUID | GROUP_UPDATE_FLAG_PET_CUR_HP | GROUP_UPDATE_FLAG_PET_MAX_HP
|
||||
| GROUP_UPDATE_FLAG_PET_POWER_TYPE | GROUP_UPDATE_FLAG_PET_CUR_POWER | GROUP_UPDATE_FLAG_PET_MAX_POWER;
|
||||
|
||||
if (player->GetVehicle())
|
||||
updateFlags |= GROUP_UPDATE_FLAG_VEHICLE_SEAT;
|
||||
|
||||
if (!player->GetPhaseShift().GetPhases().empty())
|
||||
updateFlags |= GROUP_UPDATE_FLAG_PHASE;
|
||||
|
||||
uint16 playerStatus = MEMBER_STATUS_ONLINE;
|
||||
if (player->IsPvP())
|
||||
playerStatus |= MEMBER_STATUS_PVP;
|
||||
|
||||
if (!player->IsAlive())
|
||||
{
|
||||
if (player->HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_GHOST))
|
||||
playerStatus |= MEMBER_STATUS_GHOST;
|
||||
else
|
||||
playerStatus |= MEMBER_STATUS_DEAD;
|
||||
}
|
||||
|
||||
if (player->IsFFAPvP())
|
||||
playerStatus |= MEMBER_STATUS_PVP_FFA;
|
||||
|
||||
if (player->isAFK())
|
||||
playerStatus |= MEMBER_STATUS_AFK;
|
||||
|
||||
if (player->isDND())
|
||||
playerStatus |= MEMBER_STATUS_DND;
|
||||
|
||||
data << uint32(updateFlags);
|
||||
data << uint16(playerStatus); // GROUP_UPDATE_FLAG_STATUS
|
||||
data << uint32(player->GetHealth()); // GROUP_UPDATE_FLAG_CUR_HP
|
||||
data << uint32(player->GetMaxHealth()); // GROUP_UPDATE_FLAG_MAX_HP
|
||||
if (updateFlags & GROUP_UPDATE_FLAG_POWER_TYPE)
|
||||
data << uint8(powerType);
|
||||
|
||||
data << uint16(player->GetPower(powerType)); // GROUP_UPDATE_FLAG_CUR_POWER
|
||||
data << uint16(player->GetMaxPower(powerType)); // GROUP_UPDATE_FLAG_MAX_POWER
|
||||
data << uint16(player->getLevel()); // GROUP_UPDATE_FLAG_LEVEL
|
||||
data << uint16(player->GetZoneId()); // GROUP_UPDATE_FLAG_ZONE
|
||||
data << uint16(player->GetPositionX()); // GROUP_UPDATE_FLAG_POSITION
|
||||
data << uint16(player->GetPositionY()); // GROUP_UPDATE_FLAG_POSITION
|
||||
data << uint16(player->GetPositionZ()); // GROUP_UPDATE_FLAG_POSITION
|
||||
|
||||
// GROUP_UPDATE_FLAG_AURAS
|
||||
data << uint8(1);
|
||||
uint64 auramask = 0;
|
||||
size_t maskPos = data.wpos();
|
||||
data << uint64(auramask); // placeholder
|
||||
data << uint32(MAX_AURAS); // count
|
||||
|
||||
for (uint8 i = 0; i < MAX_AURAS; ++i)
|
||||
{
|
||||
if (AuraApplication const* aurApp = player->GetVisibleAura(i))
|
||||
{
|
||||
auramask |= (uint64(1) << i);
|
||||
|
||||
data << uint32(aurApp->GetBase()->GetId());
|
||||
data << uint16(aurApp->GetFlags());
|
||||
|
||||
if (aurApp->GetFlags() & AFLAG_ANY_EFFECT_AMOUNT_SENT)
|
||||
{
|
||||
for (uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i)
|
||||
{
|
||||
if (AuraEffect const* eff = aurApp->GetBase()->GetEffect(i))
|
||||
data << int32(eff->GetAmount());
|
||||
else
|
||||
data << int32(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
data.put<uint64>(maskPos, auramask); // GROUP_UPDATE_FLAG_AURAS
|
||||
|
||||
if (updateFlags & GROUP_UPDATE_FLAG_PET_GUID)
|
||||
data << uint64(ASSERT_NOTNULL(pet)->GetGUID());
|
||||
|
||||
data << std::string(pet ? pet->GetName() : ""); // GROUP_UPDATE_FLAG_PET_NAME
|
||||
data << uint16(pet ? pet->GetDisplayId() : 0); // GROUP_UPDATE_FLAG_PET_MODEL_ID
|
||||
|
||||
if (updateFlags & GROUP_UPDATE_FLAG_PET_CUR_HP)
|
||||
data << uint32(pet->GetHealth());
|
||||
|
||||
if (updateFlags & GROUP_UPDATE_FLAG_PET_MAX_HP)
|
||||
data << uint32(pet->GetMaxHealth());
|
||||
|
||||
if (updateFlags & GROUP_UPDATE_FLAG_PET_POWER_TYPE)
|
||||
data << (uint8)pet->GetPowerType();
|
||||
|
||||
if (updateFlags & GROUP_UPDATE_FLAG_PET_CUR_POWER)
|
||||
data << uint16(pet->GetPower(pet->GetPowerType()));
|
||||
|
||||
if (updateFlags & GROUP_UPDATE_FLAG_PET_MAX_POWER)
|
||||
data << uint16(pet->GetMaxPower(pet->GetPowerType()));
|
||||
|
||||
// GROUP_UPDATE_FLAG_PET_AURAS
|
||||
uint64 petAuraMask = 0;
|
||||
data << uint8(1);
|
||||
maskPos = data.wpos();
|
||||
data << uint64(petAuraMask); // placeholder
|
||||
data << uint32(MAX_AURAS); // count
|
||||
if (pet)
|
||||
{
|
||||
for (uint8 i = 0; i < MAX_AURAS; ++i)
|
||||
{
|
||||
if (AuraApplication const* aurApp = pet->GetVisibleAura(i))
|
||||
{
|
||||
petAuraMask |= (uint64(1) << i);
|
||||
|
||||
data << uint32(aurApp->GetBase()->GetId());
|
||||
data << uint16(aurApp->GetFlags());
|
||||
|
||||
if (aurApp->GetFlags() & AFLAG_ANY_EFFECT_AMOUNT_SENT)
|
||||
{
|
||||
for (uint32 i = 0; i < MAX_SPELL_EFFECTS; ++i)
|
||||
{
|
||||
if (AuraEffect const* eff = aurApp->GetBase()->GetEffect(i))
|
||||
data << int32(eff->GetAmount());
|
||||
else
|
||||
data << int32(0);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
data.put<uint64>(maskPos, petAuraMask); // GROUP_UPDATE_FLAG_PET_AURAS
|
||||
|
||||
if (updateFlags & GROUP_UPDATE_FLAG_VEHICLE_SEAT)
|
||||
data << uint32(player->GetVehicle()->GetVehicleInfo()->SeatID[player->m_movementInfo.transport.seat]);
|
||||
|
||||
if (updateFlags & GROUP_UPDATE_FLAG_PHASE)
|
||||
PhasingHandler::FillPartyMemberPhase(&data, player->GetPhaseShift());
|
||||
|
||||
SendPacket(&data);
|
||||
WorldPackets::Party::PartyMemberState packet(true);
|
||||
packet.Initialize(player);
|
||||
SendPacket(packet.Write());
|
||||
}
|
||||
|
||||
void WorldSession::HandleRequestRaidInfoOpcode(WorldPacket& /*recvData*/)
|
||||
|
||||
Reference in new issue
Block a user