From 74a0d579eef07c013cc8deff930a975cf19c487f Mon Sep 17 00:00:00 2001 From: Shauren Date: Thu, 20 Aug 2020 18:44:36 +0200 Subject: Core/Pets: Fixed automatic resurrecting pets on battleground graveyards Closes #25289 --- src/server/scripts/Spells/spell_generic.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/server/scripts/Spells') diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index c9185324957..066fa6ff192 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -2744,8 +2744,8 @@ class spell_gen_pet_summoned : public SpellScript if (newPet->LoadPetFromDB(player, 0, player->GetLastPetNumber(), true)) { // revive the pet if it is dead - if (newPet->getDeathState() == DEAD) - newPet->setDeathState(ALIVE); + if (newPet->getDeathState() != ALIVE && newPet->getDeathState() != JUST_RESPAWNED) + newPet->setDeathState(JUST_RESPAWNED); newPet->SetFullHealth(); newPet->SetPower(newPet->GetPowerType(), newPet->GetMaxPower(newPet->GetPowerType())); -- cgit v1.2.3