aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts/Spells
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2020-08-20 18:44:36 +0200
committerShauren <shauren.trinity@gmail.com>2022-01-31 00:20:53 +0100
commit914791836318c62d8b206ef3cbffe144e63bf928 (patch)
tree336aba0edc93c51b3ac2bbfb6400e19c4ea6729e /src/server/scripts/Spells
parent4de94169e958fed60cc0c59376c8bd6583ca7daf (diff)
Core/Pets: Fixed automatic resurrecting pets on battleground graveyards
Closes #25289 (cherry picked from commit 74a0d579eef07c013cc8deff930a975cf19c487f)
Diffstat (limited to 'src/server/scripts/Spells')
-rw-r--r--src/server/scripts/Spells/spell_generic.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index 5ebaaae0049..615b22b966a 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -2612,8 +2612,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->SetFullPower(newPet->GetPowerType());