From 33e747bc8faf4bee2cf0a987f7fc3901b227db8b Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 29 Sep 2020 19:50:29 +0200 Subject: Core/Pets: Add missing nullptr check (cherry picked from commit 0152878de5c1563cbe8d13fbf4f85839d741aabf) --- src/server/game/Entities/Player/Player.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 867cdb66d8f..708f07b34d6 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -21963,7 +21963,7 @@ void Player::RemovePet(Pet* pet, PetSaveMode mode, bool returnreagent) if (!pet) { - if (mode == PET_SAVE_NOT_IN_SLOT && m_petStable->CurrentPet) + if (mode == PET_SAVE_NOT_IN_SLOT && m_petStable && m_petStable->CurrentPet) { // Handle removing pet while it is in "temporarily unsummoned" state, for example on mount CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(CHAR_UPD_CHAR_PET_SLOT_BY_ID); -- cgit v1.2.3