aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/BattlePetHandler.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2019-11-13 00:15:35 +0100
committerShauren <shauren.trinity@gmail.com>2019-11-13 00:15:35 +0100
commitce8f9b9a4efc8a3f110465db5310f08067658f60 (patch)
tree6eec5f8698a5193936553ea338f4fb1c420d2a02 /src/server/game/Handlers/BattlePetHandler.cpp
parentab6ae44b638136665e2ae6c6a434ad7426621c39 (diff)
Core/Battle Pets: Fixed possible crash in packet handler
Diffstat (limited to 'src/server/game/Handlers/BattlePetHandler.cpp')
-rw-r--r--src/server/game/Handlers/BattlePetHandler.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/server/game/Handlers/BattlePetHandler.cpp b/src/server/game/Handlers/BattlePetHandler.cpp
index 95bdffceaa0..ab4818888a4 100644
--- a/src/server/game/Handlers/BattlePetHandler.cpp
+++ b/src/server/game/Handlers/BattlePetHandler.cpp
@@ -28,7 +28,8 @@ void WorldSession::HandleBattlePetRequestJournal(WorldPackets::BattlePet::Battle
void WorldSession::HandleBattlePetSetBattleSlot(WorldPackets::BattlePet::BattlePetSetBattleSlot& battlePetSetBattleSlot)
{
if (BattlePetMgr::BattlePet* pet = GetBattlePetMgr()->GetPet(battlePetSetBattleSlot.PetGuid))
- GetBattlePetMgr()->GetSlot(battlePetSetBattleSlot.Slot)->Pet = pet->PacketInfo;
+ if (WorldPackets::BattlePet::BattlePetSlot* slot = GetBattlePetMgr()->GetSlot(battlePetSetBattleSlot.Slot))
+ slot->Pet = pet->PacketInfo;
}
void WorldSession::HandleBattlePetModifyName(WorldPackets::BattlePet::BattlePetModifyName& battlePetModifyName)