Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/BattlePets: Implemented CMSG_BATTLE_PET_UPDATE_NOTIFY (#27724)

Browse Source
This commit is contained in:
Meji
2022-02-13 19:18:18 +01:00
committed by GitHub
parent 0a923c7bf1
commit 966430dc44
7 changed files with 44 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/server/game/BattlePets/BattlePetMgr.cpp
View File

@@ -734,16 +734,6 @@ void BattlePetMgr::GrantBattlePetExperience(ObjectGuid guid, uint16 xp, BattlePe
std::vector<std::reference_wrapper<BattlePet>> updates;
updates.push_back(std::ref(*pet));
SendUpdates(std::move(updates), false);
// Update battle pet related update fields
if (Creature* summonedBattlePet = player->GetSummonedBattlePet())
{
if (summonedBattlePet->GetBattlePetCompanionGUID() == guid)
{
summonedBattlePet->SetWildBattlePetLevel(pet->PacketInfo.Level);
player->SetBattlePetData(pet);
}
}
}
void BattlePetMgr::GrantBattlePetLevel(ObjectGuid guid, uint16 grantedLevels)
@@ -763,14 +753,12 @@ void BattlePetMgr::GrantBattlePetLevel(ObjectGuid guid, uint16 grantedLevels)
if (level >= MAX_BATTLE_PET_LEVEL)
return;
Player* player = _owner->GetPlayer();
while (grantedLevels > 0 && level < MAX_BATTLE_PET_LEVEL)
{
++level;
--grantedLevels;
player->UpdateCriteria(CriteriaType::BattlePetReachLevel, pet->PacketInfo.Species, level);
_owner->GetPlayer()->UpdateCriteria(CriteriaType::BattlePetReachLevel, pet->PacketInfo.Species, level);
}
pet->PacketInfo.Level = level;
@@ -785,16 +773,6 @@ void BattlePetMgr::GrantBattlePetLevel(ObjectGuid guid, uint16 grantedLevels)
std::vector<std::reference_wrapper<BattlePet>> updates;
updates.push_back(std::ref(*pet));
SendUpdates(std::move(updates), false);
// Update battle pet related update fields
if (Creature* summonedBattlePet = player->GetSummonedBattlePet())
{
if (summonedBattlePet->GetBattlePetCompanionGUID() == guid)
{
summonedBattlePet->SetWildBattlePetLevel(pet->PacketInfo.Level);
player->SetBattlePetData(pet);
}
}
}
void BattlePetMgr::HealBattlePetsPct(uint8 pct)
@@ -817,6 +795,25 @@ void BattlePetMgr::HealBattlePetsPct(uint8 pct)
SendUpdates(std::move(updates), false);
}
void BattlePetMgr::UpdateBattlePetData(ObjectGuid guid)
{
BattlePet* pet = GetPet(guid);
if (!pet)
return;
Player* player = _owner->GetPlayer();
// Update battle pet related update fields
if (Creature* summonedBattlePet = player->GetSummonedBattlePet())
{
if (summonedBattlePet->GetBattlePetCompanionGUID() == guid)
{
summonedBattlePet->SetWildBattlePetLevel(pet->PacketInfo.Level);
player->SetBattlePetData(pet);
}
}
}
void BattlePetMgr::SummonPet(ObjectGuid guid)
{
BattlePet* pet = GetPet(guid);

1
src/server/game/BattlePets/BattlePetMgr.h
View File

@@ -185,6 +185,7 @@ public:
void GrantBattlePetExperience(ObjectGuid guid, uint16 xp, BattlePetXpSource xpSource);
void GrantBattlePetLevel(ObjectGuid guid, uint16 grantedLevels);
void HealBattlePetsPct(uint8 pct);
void UpdateBattlePetData(ObjectGuid guid);
void SummonPet(ObjectGuid guid);
void DismissPet();

5
src/server/game/Handlers/BattlePetHandler.cpp
View File

@@ -127,3 +127,8 @@ void WorldSession::HandleBattlePetSummon(WorldPackets::BattlePet::BattlePetSummo
else
GetBattlePetMgr()->DismissPet();
}
void WorldSession::HandleBattlePetUpdateNotify(WorldPackets::BattlePet::BattlePetUpdateNotify& battlePetUpdateNotify)
{
GetBattlePetMgr()->UpdateBattlePetData(battlePetUpdateNotify.PetGuid);
}

5
src/server/game/Server/Packets/BattlePetPackets.cpp
View File

@@ -203,3 +203,8 @@ void WorldPackets::BattlePet::BattlePetSummon::Read()
{
_worldPacket >> PetGuid;
}
void WorldPackets::BattlePet::BattlePetUpdateNotify::Read()
{
_worldPacket >> PetGuid;
}

10
src/server/game/Server/Packets/BattlePetPackets.h
View File

@@ -254,6 +254,16 @@ namespace WorldPackets
ObjectGuid PetGuid;
};
class BattlePetUpdateNotify final : public ClientPacket
{
public:
BattlePetUpdateNotify(WorldPacket&& packet) : ClientPacket(CMSG_BATTLE_PET_UPDATE_NOTIFY, std::move(packet)) { }
void Read() override;
ObjectGuid PetGuid;
};
}
}

2
src/server/game/Server/Protocol/Opcodes.cpp
View File

@@ -219,7 +219,7 @@ void OpcodeTable::Initialize()
DEFINE_HANDLER(CMSG_BATTLE_PET_SET_FLAGS, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleBattlePetSetFlags);
DEFINE_HANDLER(CMSG_BATTLE_PET_SUMMON, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleBattlePetSummon);
DEFINE_HANDLER(CMSG_BATTLE_PET_UPDATE_DISPLAY_NOTIFY, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
DEFINE_HANDLER(CMSG_BATTLE_PET_UPDATE_NOTIFY, STATUS_UNHANDLED, PROCESS_THREADUNSAFE, &WorldSession::Handle_NULL);
DEFINE_HANDLER(CMSG_BATTLE_PET_UPDATE_NOTIFY, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleBattlePetUpdateNotify);
DEFINE_HANDLER(CMSG_BEGIN_TRADE, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleBeginTradeOpcode);
DEFINE_HANDLER(CMSG_BINDER_ACTIVATE, STATUS_LOGGEDIN, PROCESS_INPLACE, &WorldSession::HandleBinderActivateOpcode);
DEFINE_HANDLER(CMSG_BLACK_MARKET_BID_ON_ITEM, STATUS_LOGGEDIN, PROCESS_THREADUNSAFE, &WorldSession::HandleBlackMarketBidOnItem);

2
src/server/game/Server/WorldSession.h
View File

@@ -207,6 +207,7 @@ namespace WorldPackets
class BattlePetSetFlags;
class BattlePetClearFanfare;
class BattlePetSummon;
class BattlePetUpdateNotify;
class CageBattlePet;
}
@@ -1778,6 +1779,7 @@ class TC_GAME_API WorldSession
void HandleBattlePetSetFlags(WorldPackets::BattlePet::BattlePetSetFlags& battlePetSetFlags);
void HandleBattlePetClearFanfare(WorldPackets::BattlePet::BattlePetClearFanfare& battlePetClearFanfare);
void HandleBattlePetSummon(WorldPackets::BattlePet::BattlePetSummon& battlePetSummon);
void HandleBattlePetUpdateNotify(WorldPackets::BattlePet::BattlePetUpdateNotify& battlePetUpdateNotify);
void HandleCageBattlePet(WorldPackets::BattlePet::CageBattlePet& cageBattlePet);
// Warden