diff options
| author | treeston <treeston.mmoc@gmail.com> | 2017-02-22 02:31:10 +0100 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2019-08-17 20:04:14 +0200 |
| commit | 8e4f5e162707164c7b4ac12f4e2d9267e226e91b (patch) | |
| tree | f283562b61ce70241188ad70949cab83cbeab33c /src | |
| parent | b91eac6a1c377c14ebe2b66104ac02e2f9a01ad4 (diff) | |
Core/Creature: Fix SetSpawnHealth so it cooperates with the colossal hack that is Battleground::AddCreature. *puke*
(cherrypicked from b3b4054eb44fdb9b0efe47d1a7ec3021b87a5fed)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 563f57220a4..aae73db3d69 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -1651,12 +1651,8 @@ void Creature::LoadEquipment(int8 id, bool force /*= true*/) void Creature::SetSpawnHealth() { - if (!m_creatureData) - return; - uint32 curhealth; - - if (!m_regenHealth) + if (m_creatureData && !m_regenHealth) { curhealth = m_creatureData->curhealth; if (curhealth) |