Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core/BattlePets: Implemented CMSG_BATTLE_PET_UPDATE_NOTIFY

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/966430dc449f6ac259262cb996051dfd04a6e5fb)
This commit is contained in:
hondacrx
2022-05-09 12:30:19 -04:00
parent 381f7bc02a
commit 0c186f35bb
3 changed files with 38 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/BattlePets/BattlePetManager.cs
+21 -25
View File
@@ -689,17 +689,6 @@ namespace Game.BattlePets
List<BattlePet> updates = new();
updates.Add(pet);
SendUpdates(updates, false);
// Update battle pet related update fields
Creature summonedBattlePet = player.GetSummonedBattlePet();
if (summonedBattlePet != null)
{
if (summonedBattlePet.GetBattlePetCompanionGUID() == guid)
{
summonedBattlePet.SetWildBattlePetLevel(pet.PacketInfo.Level);
player.SetBattlePetData(pet);
}
}
}
public void GrantBattlePetLevel(ObjectGuid guid, ushort grantedLevels)
@@ -720,14 +709,12 @@ namespace Game.BattlePets
if (level >= SharedConst.MaxBattlePetLevel)
return;
Player player = _owner.GetPlayer();
while (grantedLevels > 0 && level < SharedConst.MaxBattlePetLevel)
{
++level;
--grantedLevels;
player.UpdateCriteria(CriteriaType.BattlePetReachLevel, pet.PacketInfo.Species, level);
_owner.GetPlayer().UpdateCriteria(CriteriaType.BattlePetReachLevel, pet.PacketInfo.Species, level);
}
pet.PacketInfo.Level = level;
@@ -742,17 +729,6 @@ namespace Game.BattlePets
List<BattlePet> updates = new List<BattlePet>();
updates.Add(pet);
SendUpdates(updates, false);
// Update battle pet related update fields
Creature summonedBattlePet = player.GetSummonedBattlePet();
if (summonedBattlePet != null)
{
if (summonedBattlePet.GetBattlePetCompanionGUID() == guid)
{
summonedBattlePet.SetWildBattlePetLevel(pet.PacketInfo.Level);
player.SetBattlePetData(pet);
}
}
}
public void HealBattlePetsPct(byte pct)
@@ -777,6 +753,26 @@ namespace Game.BattlePets
SendUpdates(updates, false);
}
public void UpdateBattlePetData(ObjectGuid guid)
{
BattlePet pet = GetPet(guid);
if (pet == null)
return;
Player player = _owner.GetPlayer();
// Update battle pet related update fields
Creature summonedBattlePet = player.GetSummonedBattlePet();
if (summonedBattlePet != null)
{
if (summonedBattlePet.GetBattlePetCompanionGUID() == guid)
{
summonedBattlePet.SetWildBattlePetLevel(pet.PacketInfo.Level);
player.SetBattlePetData(pet);
}
}
}
public void SummonPet(ObjectGuid guid)
{
BattlePet pet = GetPet(guid);
Source/Game/Handlers/BattlePetHandler.cs
+6
View File
@@ -146,5 +146,11 @@ namespace Game
else
GetBattlePetMgr().DismissPet();
}
[WorldPacketHandler(ClientOpcodes.BattlePetUpdateNotify)]
void HandleBattlePetUpdateNotify(BattlePetUpdateNotify battlePetUpdateNotify)
{
GetBattlePetMgr().UpdateBattlePetData(battlePetUpdateNotify.PetGuid);
}
}
}
Source/Game/Networking/Packets/BattlePetPackets.cs
+11
View File
@@ -301,7 +301,18 @@ namespace Game.Networking.Packets
public ObjectGuid PetGuid;
}
class BattlePetUpdateNotify : ClientPacket
{
public ObjectGuid PetGuid;
public BattlePetUpdateNotify(WorldPacket packet) : base(packet) { }
public override void Read()
{
PetGuid = _worldPacket.ReadPackedGuid();
}
}
//Structs
public struct BattlePetStruct
{