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

Core/BattlePets: Misc fixes

Browse Source
This commit is contained in:
hondacrx
2018-01-02 13:00:19 -05:00
parent ba92c58e6c
commit c7798c00fc
7 changed files with 51 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Handlers/BattlePetHandler.cs
+5 -10
View File
@@ -27,15 +27,7 @@ namespace Game
[WorldPacketHandler(ClientOpcodes.BattlePetRequestJournal)]
void HandleBattlePetRequestJournal(BattlePetRequestJournal battlePetRequestJournal)
{
// TODO: Move this to BattlePetMgr::SendJournal() just to have all packets in one file
BattlePetJournal battlePetJournal = new BattlePetJournal();
battlePetJournal.Trap = GetBattlePetMgr().GetTrapLevel();
foreach (var battlePet in GetBattlePetMgr().GetLearnedPets())
battlePetJournal.Pets.Add(battlePet.PacketInfo);
battlePetJournal.Slots = GetBattlePetMgr().GetSlots();
SendPacket(battlePetJournal);
GetBattlePetMgr().SendJournal();
}
[WorldPacketHandler(ClientOpcodes.BattlePetSetBattleSlot)]
@@ -90,7 +82,10 @@ namespace Game
[WorldPacketHandler(ClientOpcodes.BattlePetSummon, Processing = PacketProcessing.Inplace)]
void HandleBattlePetSummon(BattlePetSummon battlePetSummon)
{
GetBattlePetMgr().SummonPet(battlePetSummon.PetGuid);
if (_player.GetGuidValue(PlayerFields.SummonedBattlePetId) != battlePetSummon.PetGuid)
GetBattlePetMgr().SummonPet(battlePetSummon.PetGuid);
else
GetBattlePetMgr().DismissPet();
}
}
}