aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortreeston <treeston.mmoc@gmail.com>2017-02-22 02:31:10 +0100
committertreeston <treeston.mmoc@gmail.com>2017-02-22 02:31:32 +0100
commitb3b4054eb44fdb9b0efe47d1a7ec3021b87a5fed (patch)
tree570ba2efcdd9a0ed3c5d86f341728488c037ca07 /src
parentf4ae639961542112dddcf627fc2e1f11967048a9 (diff)
Core/Creature: Fix SetSpawnHealth so it cooperates with the colossal hack that is Battleground::AddCreature. *puke*
Diffstat (limited to 'src')
-rw-r--r--src/server/game/Entities/Creature/Creature.cpp6
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 ca428592119..4d80ca7b855 100644
--- a/src/server/game/Entities/Creature/Creature.cpp
+++ b/src/server/game/Entities/Creature/Creature.cpp
@@ -1552,12 +1552,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)