5 files changed, 9 insertions, 8 deletions
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index 3591179eb23..d88dddedd0c 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -132,7 +132,7 @@ bool AssistDelayEvent::Execute(uint64 /*e_time*/, uint32 /*p_time*/)
     return true;
 }
 
-CreatureBaseStats const* CreatureBaseStats::GetBaseStats(uint32 level, uint8 unitClass)
+CreatureBaseStats const* CreatureBaseStats::GetBaseStats(uint8 level, uint8 unitClass)
 {
     return objmgr.GetCreatureBaseStats(level, unitClass);
 }
@@ -1083,6 +1083,7 @@ void Creature::SelectLevel(const CreatureInfo *cinfo)
     SetLevel(level);
 
     CreatureBaseStats const* stats = objmgr.GetCreatureBaseStats(level, cinfo->unit_class);
+    assert(stats); // should not be null
 
     // health
     float healthmod = _GetHealthMod(rank);
diff --git a/src/game/Creature.h b/src/game/Creature.h
index d19ee3635a1..57f7968e58d 100644
--- a/src/game/Creature.h
+++ b/src/game/Creature.h
@@ -82,8 +82,8 @@ struct CreatureInfo
     char*   SubName;
     char*   IconName;
     uint32  GossipMenuId;
-    uint32  minlevel;
-    uint32  maxlevel;
+    uint8   minlevel;
+    uint8   maxlevel;
     uint32  expansion;
     uint32  faction_A;
     uint32  faction_H;
@@ -172,7 +172,7 @@ struct CreatureInfo
 // Defines base stats for creatures (used to calculate HP/mana/armor).
 struct CreatureBaseStats
 {
-    uint32 Level;
+    uint8 Level;
     uint8 Class;
     uint32 BaseHealth[MAX_CREATURE_BASE_HP];
     uint32 BaseMana;
@@ -199,7 +199,7 @@ struct CreatureBaseStats
         return uint32((BaseArmor * info->ModArmor) + 0.5f);
     }
 
-    static CreatureBaseStats const* GetBaseStats(uint32 level, uint8 unitClass);
+    static CreatureBaseStats const* GetBaseStats(uint8 level, uint8 unitClass);
 };
 
 typedef std::vector<CreatureBaseStats> CreatureBaseStatsList;
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 0709d4f6a5a..f6e15872d85 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -8920,7 +8920,7 @@ void ObjectMgr::RemoveGMTicket(uint64 ticketGuid, int64 source, bool permanently
     RemoveGMTicket(ticket, source, permanently);
 }
 
-CreatureBaseStats const* ObjectMgr::GetCreatureBaseStats(uint32 level, uint8 unitClass)
+CreatureBaseStats const* ObjectMgr::GetCreatureBaseStats(uint8 level, uint8 unitClass)
 {
     for (CreatureBaseStatsList::const_iterator it = m_creatureBaseStatsList.begin(); it != m_creatureBaseStatsList.end(); ++it)
     {
diff --git a/src/game/ObjectMgr.h b/src/game/ObjectMgr.h
index faa29d4ce7f..524ad869dd0 100644
--- a/src/game/ObjectMgr.h
+++ b/src/game/ObjectMgr.h
@@ -690,7 +690,7 @@ class ObjectMgr
 
         void ReturnOrDeleteOldMails(bool serverUp);
 
-        CreatureBaseStats const* GetCreatureBaseStats(uint32 level, uint8 unitClass);
+        CreatureBaseStats const* GetCreatureBaseStats(uint8 level, uint8 unitClass);
 
         void SetHighestGuids();
         uint32 GenerateLowGuid(HighGuid guidhigh);
diff --git a/src/shared/Database/SQLStorage.cpp b/src/shared/Database/SQLStorage.cpp
index 01b3e283250..d858ca21af0 100644
--- a/src/shared/Database/SQLStorage.cpp
+++ b/src/shared/Database/SQLStorage.cpp
@@ -28,7 +28,7 @@ extern DatabaseMysql  WorldDatabase;
 #endif
 
 const char CreatureInfosrcfmt[]="iiiiiiiiiisssiiiiiiiffiffiifiiiiiiiiiiffiiiiiiiiiiiiiiiiiiiiiiiisiifffliiiiiiiliiisi";
-const char CreatureInfodstfmt[]="iiiiiiiiiisssiiiiiiiffiffiifiiiiiiiiiiffiiiiiiiiiiiiiiiiiiiiiiiisiifffliiiiiiiliiiii";
+const char CreatureInfodstfmt[]="iiiiiiiiiisssibbiiiiffiffiifiiiiiiiiiiffiiiiiiiiiiiiiiiiiiiiiiiisiifffliiiiiiiliiiii";
 const char CreatureDataAddonInfofmt[]="iiiiiis";
 const char CreatureModelfmt[]="iffbi";
 const char CreatureInfoAddonInfofmt[]="iiiiiis";