3 files changed, 44 insertions, 8 deletions
diff --git a/sql/updates/world/6.x/2016_09_06_05_world_.sql b/sql/updates/world/6.x/2016_09_06_05_world.sql
index f3148731a30..f3148731a30 100644
--- a/sql/updates/world/6.x/2016_09_06_05_world_.sql
+++ b/sql/updates/world/6.x/2016_09_06_05_world.sql
diff --git a/sql/updates/world/6.x/2016_09_07_01_world.sql b/sql/updates/world/6.x/2016_09_07_01_world.sql
new file mode 100644
index 00000000000..d3dab06b568
--- /dev/null
+++ b/sql/updates/world/6.x/2016_09_07_01_world.sql
@@ -0,0 +1,42 @@
+DELETE FROM `creature_classlevelstats` WHERE `level` IN (106, 107, 108, 109, 110, 111, 112, 113, 114, 115);
+INSERT INTO `creature_classlevelstats` (`level`, `class`, `basemana`) VALUES
+(106, 1, 0),
+(106, 2, 1),
+(106, 4, 0),
+(106, 8, 1),
+(107, 1, 0),
+(107, 2, 1),
+(107, 4, 0),
+(107, 8, 1),
+(108, 1, 0),
+(108, 2, 1),
+(108, 4, 0),
+(108, 8, 1),
+(109, 1, 0),
+(109, 2, 1),
+(109, 4, 0),
+(109, 8, 1),
+(110, 1, 0),
+(110, 2, 1),
+(110, 4, 0),
+(110, 8, 1),
+(111, 1, 0),
+(111, 2, 1),
+(111, 4, 0),
+(111, 8, 1),
+(112, 1, 0),
+(112, 2, 1),
+(112, 4, 0),
+(112, 8, 1),
+(113, 1, 0),
+(113, 2, 1),
+(113, 4, 0),
+(113, 8, 1),
+(114, 1, 0),
+(114, 2, 1),
+(114, 4, 0),
+(114, 8, 1),
+(115, 1, 0),
+(115, 2, 1),
+(115, 4, 0),
+(115, 8, 1);
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index a0a1288f1bb..b45fcd85347 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -964,15 +964,9 @@ void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo)
             const_cast<CreatureTemplate*>(cInfo)->scale = 1.0f;
     }
 
-    if (cInfo->HealthScalingExpansion > (MAX_EXPANSIONS - 1))
+    if (cInfo->HealthScalingExpansion < EXPANSION_LEVEL_CURRENT || cInfo->HealthScalingExpansion > (MAX_EXPANSIONS - 1))
     {
-        TC_LOG_ERROR("sql.sql", "Table `creature_template` lists creature (ID: %u) with invalid `HealthScalingExpansion` %u. Ignored and set to 0.", cInfo->Entry, cInfo->HealthScalingExpansion);
-        const_cast<CreatureTemplate*>(cInfo)->HealthScalingExpansion = 0;
-    }
-
-    if ((cInfo->HealthScalingExpansion > (MAX_EXPANSIONS - 1)) && cInfo->HealthScalingExpansion != EXPANSION_LEVEL_CURRENT)
-    {
-        TC_LOG_ERROR("sql.sql", "Table `creature_template` lists creature (Entry: %u) with `HealthScalingExpansion` %u. Ignored and set to 0.", cInfo->Entry, cInfo->HealthScalingExpansion);
+        TC_LOG_ERROR("sql.sql", "Table `creature_template` lists creature (ID: %u) with invalid `HealthScalingExpansion` %i. Ignored and set to 0.", cInfo->Entry, cInfo->HealthScalingExpansion);
         const_cast<CreatureTemplate*>(cInfo)->HealthScalingExpansion = 0;
     }