aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities/Pet
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2020-08-17 20:01:48 +0200
committerShauren <shauren.trinity@gmail.com>2022-01-31 00:20:40 +0100
commit4de94169e958fed60cc0c59376c8bd6583ca7daf (patch)
tree44150d63e98174959eb4eece333c2a24d3518ec2 /src/server/game/Entities/Pet
parent87b1c3700e8b8e5722b31fef2de124a2f39915c0 (diff)
Core/Pets: Fix loading pet data
Closes #25269 (cherry picked from commit a9a4f05a282fd85e4f22923ec251c92e79581a47)
Diffstat (limited to 'src/server/game/Entities/Pet')
-rw-r--r--src/server/game/Entities/Pet/Pet.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/game/Entities/Pet/Pet.cpp b/src/server/game/Entities/Pet/Pet.cpp
index 489d7c96aa6..b9d6f0fcda7 100644
--- a/src/server/game/Entities/Pet/Pet.cpp
+++ b/src/server/game/Entities/Pet/Pet.cpp
@@ -339,6 +339,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