From a9a4f05a282fd85e4f22923ec251c92e79581a47 Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Mon, 17 Aug 2020 20:01:48 +0200
Subject: Core/Pets: Fix loading pet data

Closes #25269
---
 src/server/game/Entities/Pet/Pet.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/server')

diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp
index 30df47ddb28..f1e4fd04311 100644
--- a/src/server/game/Entities/Pet/Pet.cpp
+++ b/src/server/game/Entities/Pet/Pet.cpp
@@ -328,6 +328,9 @@ bool Pet::LoadPetFromDB(Player* owner, uint32 petEntry, uint32 petnumber, bool c
 
         petStable->CurrentPet = std::move(*unslottedPetItr);
         petStable->UnslottedPets.erase(unslottedPetItr);
+
+        // old petInfo pointer is no longer valid, refresh it
+        petInfo = &petStable->CurrentPet.value();
     }
 
     // Send fake summon spell cast - this is needed for correct cooldown application for spells
-- 
cgit v1.2.3