Player/Pet: Do not respawn pet when dying while mounted

Closes cmangos/issues#3005
cmangos · Jun 28, 2022 · 0a6384c · 0a6384c
1 parent 05f79fa
commit 0a6384c
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/game/Entities/Player.cpp b/src/game/Entities/Player.cpp
@@ -1733,8 +1733,11 @@ void Player::SetDeathState(DeathState s)
 
         ClearResurrectRequestData();
 
+        bool petAlive = true; // PET_SAVE_REAGENTS when pet is unsummoned
         if (Pet* pet = GetPet())
-            RemovePet(pet->IsAlive() ? PET_SAVE_REAGENTS : PET_SAVE_AS_CURRENT);
+            petAlive = pet->IsAlive();
+
+        RemovePet(petAlive ? PET_SAVE_REAGENTS : PET_SAVE_AS_CURRENT);
 
         // Remove guardians (only players are supposed to have pets/guardians removed on death)
         RemoveGuardians();