aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortreeston <treeston.mmoc@gmail.com>2016-08-09 00:19:22 +0200
committertreeston <treeston.mmoc@gmail.com>2016-08-09 00:19:22 +0200
commitac35f93c2d6d5436054be474da06c9483e311c36 (patch)
tree66c15df37a0f8487c6691ca662d555d03771009b /src
parent5b6eb29b74bbc9e62f12c449b1896a075bdd25a2 (diff)
Entity/Creature: Fix spawn health, for real this time. Closes #17757. Also for real this time.
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Creature/Creature.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp
index b8170af0436..53f31bddf7d 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -1449,7 +1449,7 @@ void Creature::SetSpawnHealth()
SetPower(POWER_MANA, GetMaxPower(POWER_MANA));
}
- SetHealth(m_deathState == ALIVE ? curhealth : 0);
+ SetHealth((m_deathState == ALIVE || m_deathState == JUST_RESPAWNED) ? curhealth : 0);
}
bool Creature::hasQuest(uint32 quest_id) const