From 8e4f5e162707164c7b4ac12f4e2d9267e226e91b Mon Sep 17 00:00:00 2001
From: treeston <treeston.mmoc@gmail.com>
Date: Wed, 22 Feb 2017 02:31:10 +0100
Subject: [PATCH] Core/Creature: Fix SetSpawnHealth so it cooperates with the
 colossal hack that is Battleground::AddCreature. *puke*

(cherrypicked from b3b4054eb44fdb9b0efe47d1a7ec3021b87a5fed)
---
 src/server/game/Entities/Creature/Creature.cpp | 6 +-----
 1 file changed, 1 insertion(+), 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)